summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
Diffstat (limited to 'web/sass-files')
-rw-r--r--web/sass-files/sass/partials/_base.scss7
-rw-r--r--web/sass-files/sass/partials/_mentions.scss8
-rw-r--r--web/sass-files/sass/partials/_modal.scss3
-rw-r--r--web/sass-files/sass/partials/_search.scss10
-rw-r--r--web/sass-files/sass/partials/_settings.scss4
-rw-r--r--web/sass-files/sass/partials/_signup.scss3
6 files changed, 26 insertions, 9 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 841db7c5a..4237ee1fa 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -97,6 +97,9 @@ a:focus, a:hover {
.form-control {
@include border-radius(2px);
+ &:focus {
+ @include box-shadow(none);
+ }
&.no-resize {
resize: none;
}
@@ -120,6 +123,10 @@ a:focus, a:hover {
z-index: 100;
}
+.nav>li>a:focus, .nav>li>a:hover {
+ background: transparent;
+}
+
.btn {
@include single-transition(all, 0.25s, ease-in);
@include border-radius(1px);
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index a2bd0dcea..fb74eb4f5 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -57,5 +57,11 @@
.mention-highlight {
background-color:#fff2bb;
- color: #333;
+ a {
+ color: inherit;
+ text-decoration: underline;
+ &:hover, &:active {
+ color: inherit;
+ }
+ }
} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 96b26f251..2722333a4 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -144,11 +144,10 @@
font-size: 0.9em;
overflow: hidden;
text-overflow: ellipsis;
- color: #999;
+ @include opacity(0.8);
margin: 5px 0;
}
.more-channel-name {
- color: #444;
font-weight: 600;
font-size: 0.95em;
}
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index bcb8b5eac..a7b1ab190 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -104,7 +104,13 @@
padding: 10px;
}
-.search-highlight.theme, .search-highlight {
+.search-highlight {
background-color: #FFF2BB;
- color: #333;
+ a {
+ color: inherit;
+ text-decoration: underline;
+ &:hover, &:active {
+ color: inherit;
+ }
+ }
}
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 42475efd5..9369cc097 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -240,10 +240,6 @@
margin-right:5px;
}
-.member-list-holder {
- background-color:#fff;
-}
-
.member-div {
border-bottom:1px solid lightgrey;
position:relative;
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 924f0718a..47235eb50 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -12,6 +12,9 @@
&.padding--less {
padding-top: 50px;
}
+ .form-control:focus {
+ @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6));
+ }
h1, h2, h3, h4, h5, h6, p {
line-height: 1.3;