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/_admin-console.scss329
-rw-r--r--web/sass-files/sass/partials/_base.scss7
-rw-r--r--web/sass-files/sass/partials/_headers.scss1
-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
8 files changed, 195 insertions, 170 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss
index 5037da415..09907da6d 100644
--- a/web/sass-files/sass/partials/_admin-console.scss
+++ b/web/sass-files/sass/partials/_admin-console.scss
@@ -1,193 +1,202 @@
-
-.sidebar--left { &.sidebar--collapsable {
- background: #333;
- .team__header {
- background: transparent;
- margin-bottom: 5px;
- }
- .nav {
- li {
- padding: 0;
- .icon {
- width: 17px;
- }
- > a {
- color: #fff;
- padding: 9px 15px;
- display: block;
- &:hover, &.active, &:focus {
- background-color: $primary-color;
- }
- }
- > h4 {
- background: #333;
- padding: 10px 10px;
- margin: 1px 0 0;
- }
- }
- .menu-icon--right {
- vertical-align: top;
- padding: 5px 10px;
- margin: -5px;
- float: right;
- .fa {
- font-size: 13px;
- right: -2px;
- position: relative;
- color: #fff;
- }
+#admin_controller {
+ > div {
+ height: 100%;
+ }
+ .table {
+ background: #fff;
+ }
+ .sidebar--left {
+ &.sidebar--collapsable {
+ background: #333;
+ .team__header {
+ background: transparent;
+ margin-bottom: 5px;
}
- &.nav__sub-menu {
- background: #111;
- -webkit-font-smoothing: auto;
- &.padded {
- padding: 5px 0;
- }
+ .nav {
li {
+ padding: 0;
+ .icon {
+ width: 17px;
+ }
> a {
- font-size: 13px;
- padding: 5px 15px;
- background: transparent;
- color: #bbb;
- &:hover {
- color: lighten($primary-color, 10);
- }
- &.active {
- color: #fff;
- font-weight: 600;
+ padding: 9px 15px;
+ display: block;
+ &:hover, &.active, &:focus {
+ background-color: #EAEAEA;
}
}
- .nav-more {
+ > h4 {
+ background: #333;
+ padding: 10px 10px;
+ margin: 1px 0 0;
+ }
+ }
+ .menu-icon--right {
+ vertical-align: top;
+ padding: 5px 10px;
+ margin: -5px;
+ float: right;
+ .fa {
font-size: 13px;
- padding: 5px 15px;
- background: transparent;
- color: #bbb;
- display: block;
- cursor: pointer;
- &:hover {
- color: lighten($primary-color, 10);
+ right: -2px;
+ position: relative;
+ color: #fff;
+ }
+ }
+ &.nav__sub-menu {
+ background: #111;
+ -webkit-font-smoothing: auto;
+ &.padded {
+ padding: 5px 0;
+ }
+ li {
+ > a {
+ font-size: 13px;
+ padding: 5px 15px;
+ background: transparent;
+ color: #bbb;
+ &:hover {
+ color: lighten($primary-color, 10);
+ }
+ &.active {
+ color: #fff;
+ font-weight: 600;
+ }
+ }
+ .nav-more {
+ font-size: 13px;
+ padding: 5px 15px;
+ background: transparent;
+ color: #bbb;
+ display: block;
+ cursor: pointer;
+ &:hover {
+ color: lighten($primary-color, 10);
+ }
}
}
}
- }
- &.nav__inner-menu {
- li {
- > a {
- padding-left: 20px;
+ &.nav__inner-menu {
+ li {
+ > a {
+ padding-left: 20px;
+ }
}
}
}
}
}
-}
-.log__panel {
- overflow: scroll;
- width: 100%;
- height: 800px;
- border: 1px solid #ddd;
- margin-top: 10px;
- padding: 5px;
- background-color: white;
-}
-
-.app__content {
- &.admin {
- overflow: auto;
- background-color: #f1f1f1;
- padding: 0 20px 20px;
- min-height: 600px;
- }
- .wrapper--fixed {
- max-width: 800px;
+ .log__panel {
+ overflow: scroll;
+ width: 100%;
+ height: 800px;
+ border: 1px solid #ddd;
+ margin-top: 10px;
+ padding: 5px;
+ background-color: white;
}
- .form-horizontal {
- margin-top: 40px;
- .control-label {
- text-align: left;
- padding-right: 0;
- font-weight: 600;
+
+ .app__content {
+ &.admin {
+ overflow: auto;
+ background-color: #f1f1f1;
+ padding: 0 20px 20px;
+ min-height: 600px;
}
- .form-group {
- margin-bottom: 25px;
+ .wrapper--fixed {
+ max-width: 800px;
}
- .help-text {
- margin: 10px 0 0 15px;
- color: #777;
- .help-link {
- margin-right: 5px;
+ .form-horizontal {
+ margin-top: 40px;
+ .control-label {
+ text-align: left;
+ padding-right: 0;
+ font-weight: 600;
}
- .btn {
- font-size: 13px;
+ .form-group {
+ margin-bottom: 25px;
+ }
+ .help-text {
+ margin: 10px 0 0 15px;
+ color: #777;
+ .help-link {
+ margin-right: 5px;
+ }
+ .btn {
+ font-size: 13px;
+ }
+ }
+ .alert {
+ display: inline-block;
+ padding: 5px 7px;
+ margin: 1em 0 0;
+ top: 1px;
+ position: relative;
+ .fa {
+ margin-right: 5px;
+ }
}
}
- .alert {
- display: inline-block;
- padding: 5px 7px;
- margin: 0;
- top: 1px;
- position: relative;
- }
- }
- .banner {
- background: #fff;
- border: 1px solid #ddd;
- padding: 0.7em 1.5em;
- font-size: 0.95em;
- margin: 2em 0;
- .banner__heading {
- font-size: 1.5em;
+ .banner {
+ background: #fff;
+ border: 1px solid #ddd;
+ padding: 0.7em 1.5em;
+ font-size: 0.95em;
+ margin: 2em 0;
+ .banner__heading {
+ font-size: 1.5em;
+ }
+ .banner__content {
+ width: 80%;
+ }
}
- .banner__content {
- width: 80%;
+ .popover {
+ border-radius: 3px;
+ width: 100%;
+ font-size: 0.95em;
}
- }
- .popover {
- border-radius: 3px;
- width: 100%;
- font-size: 0.95em;
- }
- .panel {
- border: none;
- background-color: transparent;
- }
- .panel-default {
- > .panel-heading {
- padding: 10px 0;
+ .panel {
+ border: none;
background-color: transparent;
}
- .panel-body {
- padding: 30px 0 10px;
+ .panel-default {
+ > .panel-heading {
+ padding: 10px 0;
+ background-color: transparent;
+ }
+ .panel-body {
+ padding: 30px 0 10px;
+ }
+ }
+ .panel-group {
+ margin-bottom: 50px;
}
- }
- .panel-group {
- margin-bottom: 50px;
- }
- .panel-title {
- font-size: 24px;
- line-height: 1.5;
- a {
- text-decoration: none;
- display: block;
- @include clearfix;
- &.collapsed {
- .fa-minus {
- display: none;
+ .panel-title {
+ font-size: 24px;
+ line-height: 1.5;
+ a {
+ text-decoration: none;
+ display: block;
+ @include clearfix;
+ &.collapsed {
+ .fa-minus {
+ display: none;
+ }
+ .fa-plus {
+ display: inline-block;
+ }
+ }
+ .fa {
+ font-size: 18px;
+ float: right;
+ margin-top: 8px;
+ color: #aaa;
}
.fa-plus {
- display: inline-block;
+ display: none;
}
}
- .fa {
- font-size: 18px;
- float: right;
- margin-top: 8px;
- color: #aaa;
- }
- .fa-plus {
- display: none;
- }
}
}
-
} \ No newline at end of file
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/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index 2a4e82fc7..8e353aff9 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -37,7 +37,6 @@
&.description {
overflow: hidden;
text-overflow: ellipsis;
- @include opacity(0.6);
margin-top: 2px;
max-height: 45px;
}
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 48f8adf4e..fcf0d5d77 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;
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-07 09:17:49 +0000