summaryrefslogtreecommitdiffstats
path: root/webapp/sass
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-17 07:21:39 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-17 07:21:39 -0400
commitfd53e3b7868234af328cd73150318fc8e7a26b89 (patch)
tree48c49af0d6b25bf978430efc61aa5b3b63b3414a /webapp/sass
parent5f5f813387a914d6e34945490c438755adfa8505 (diff)
downloadchat-fd53e3b7868234af328cd73150318fc8e7a26b89.tar.gz
chat-fd53e3b7868234af328cd73150318fc8e7a26b89.tar.bz2
chat-fd53e3b7868234af328cd73150318fc8e7a26b89.zip
PLT-2257 Reorganized System Console (#3003)
* Reorganized system console * Fixed the names of some components * Fixed timestamp for BrandImageSetting * Fixed merge issues * Updated push notification settings to match master branch * Removed top level setting pages and moved enable Gitlab/LDAP settings onto their respective pages * Re-added restrictDirectMessage setting to system console * Re-added email connection test and fixed some margins * Fixed ESLint errors * Renamed Authentication > Onboarding to Authentication > Email in the system console * Renamed Customization > Whitelabeling to Customization > Custom Branding in System Console * Re-added EnableOpenServer to system console
Diffstat (limited to 'webapp/sass')
-rw-r--r--webapp/sass/components/_module.scss1
-rw-r--r--webapp/sass/components/_save-button.scss7
-rw-r--r--webapp/sass/layout/_headers.scss3
-rw-r--r--webapp/sass/routes/_admin-console.scss463
4 files changed, 235 insertions, 239 deletions
diff --git a/webapp/sass/components/_module.scss b/webapp/sass/components/_module.scss
index 24488df96..e74404d9c 100644
--- a/webapp/sass/components/_module.scss
+++ b/webapp/sass/components/_module.scss
@@ -11,6 +11,7 @@
@import 'modal';
@import 'oauth';
@import 'popover';
+@import 'save-button';
@import 'scrollbar';
@import 'search';
@import 'suggestion-list';
diff --git a/webapp/sass/components/_save-button.scss b/webapp/sass/components/_save-button.scss
new file mode 100644
index 000000000..12f793aa1
--- /dev/null
+++ b/webapp/sass/components/_save-button.scss
@@ -0,0 +1,7 @@
+@charset 'UTF-8';
+
+.save-button {
+ .glyphicon {
+ margin-right: 10px;
+ }
+} \ No newline at end of file
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 35fef8e08..35b9e5524 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -118,7 +118,8 @@
// Team Header in Sidebar
.sidebar--left,
-.sidebar--menu {
+.sidebar--menu,
+.admin-sidebar {
.team__header {
@include legacy-pie-clearfix;
padding: 9px 10px;
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index 0f47e7529..a4c8621c8 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -1,6 +1,12 @@
@charset 'UTF-8';
-.admin-controller {
+.admin-console {
+ color: #333;
+ height: 100%;
+ margin-left: 220px;
+ overflow: auto;
+ padding: 0 20px;
+
> div {
height: 100%;
}
@@ -34,122 +40,6 @@
}
}
- .sidebar--left {
- &.sidebar--collapsable {
- background: #333;
-
- .team__header {
- background: transparent;
- margin-bottom: 5px;
- }
-
- .nav {
- li {
- padding: 0;
- @include opacity(1);
-
- .icon {
- width: 17px;
- }
-
- &.divider {
- @include alpha-property(background, $black, .1);
- }
-
- > a {
- &:hover,
- &:focus {
- @include alpha-property(background, $black, .1);
- }
-
- &.active {
- background-color: transparent;
- }
- }
-
- > h4 {
- background: alpha-color($white, .15);
- color: $white;
- margin: 1px 0 0;
- padding: 10px;
-
- .menu-icon--right {
- right: 12px;
- top: 6px;
- }
- }
- }
-
- .menu-icon--right {
- font-size: 18px;
- font-weight: 600;
- height: 20px;
- line-height: 20px;
- position: absolute;
- right: 10px;
- text-align: center;
- top: 3px;
- width: 20px;
-
- .fa {
- color: $white;
- font-size: 13px;
- position: relative;
- right: -2px;
- }
- }
-
- &.nav__sub-menu {
- @include font-smoothing(initial);
- background: #111;
-
- &.padded {
- padding: 5px 0;
- }
-
- li {
- > a {
- background: transparent;
- color: #bbb;
- font-size: 13px;
- padding: 5px 35px 5px 15px;
-
- &:hover {
- color: lighten($primary-color, 10);
- }
-
- &.active {
- color: $white;
- font-weight: 600;
- }
- }
-
- .nav-more {
- background: transparent;
- color: #bbb;
- cursor: pointer;
- display: block;
- font-size: 13px;
- padding: 5px 15px;
-
- &:hover {
- color: lighten($primary-color, 10);
- }
- }
- }
- }
-
- &.nav__inner-menu {
- li {
- > a {
- padding-left: 20px;
- }
- }
- }
- }
- }
- }
-
.log__panel {
background-color: white;
border: 1px solid #ddd;
@@ -160,168 +50,160 @@
width: 100%;
}
- .app__content {
- color: #333;
+ &.admin {
+ background-color: #f1f1f1;
+ min-height: 600px;
+ overflow: auto;
+ padding: 0 40px 20px;
+ }
- &.admin {
- background-color: #f1f1f1;
- min-height: 600px;
- overflow: auto;
- padding: 0 40px 20px;
- }
+ .wrapper--fixed {
+ max-width: 800px;
+ }
- .wrapper--fixed {
- max-width: 800px;
+ .form-horizontal {
+ margin-top: 40px;
+
+ .control-label {
+ font-weight: 600;
+ padding-right: 0;
+ text-align: left;
}
- .form-horizontal {
- margin-top: 40px;
+ .form-group {
+ margin-bottom: 25px;
+ }
- .control-label {
- font-weight: 600;
- padding-right: 0;
- text-align: left;
+ .file__upload {
+ display: inline-block;
+ margin: 0 10px 10px 0;
+ position: relative;
+
+ input {
+ @include opacity(0);
+ height: 100%;
+ left: 0;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 5;
}
+ }
- .form-group {
- margin-bottom: 25px;
+ .help-text {
+ color: #777;
+ margin: 10px 0 0 15px;
- &.form-group--small {
- margin-bottom: 10px;
- }
+ &.no-margin {
+ margin: 0;
}
- .file__upload {
- display: inline-block;
- margin: 0 10px 10px 0;
- position: relative;
-
- input {
- @include opacity(0);
- height: 100%;
- left: 0;
- position: absolute;
- top: 0;
- width: 100%;
- z-index: 5;
- }
+ &.no-margin--top {
+ margin-top: 0;
}
- .help-text {
- color: #777;
- margin: 10px 0 0 15px;
-
- &.no-margin {
- margin: 0;
- }
-
- &.no-margin--top {
- margin-top: 0;
- }
-
- ul,
- ol {
- padding-left: 23px;
- }
-
- .help-link {
- margin-right: 5px;
- }
-
- .btn {
- font-size: 13px;
- }
+ ul,
+ ol {
+ padding-left: 23px;
}
- .alert {
- display: inline-block;
- margin: 1em 0 0;
- padding: 5px 7px;
- position: relative;
- top: 1px;
+ .help-link {
+ margin-right: 5px;
+ }
- .fa {
- margin-right: 5px;
- }
+ .btn {
+ font-size: 13px;
}
}
- .banner {
- background: $white;
- border: 1px solid #ddd;
- font-size: .95em;
- margin: 2em 0;
- padding: .7em 1.5em;
+ .alert {
+ display: inline-block;
+ margin: 1em 0 0;
+ padding: 5px 7px;
+ position: relative;
+ top: 1px;
- .banner__heading {
- font-size: 1.5em;
+ .fa {
+ margin-right: 5px;
}
+ }
+ }
- .banner__content {
- width: 80%;
- }
+ .banner {
+ background: $white;
+ border: 1px solid #ddd;
+ font-size: .95em;
+ margin: 2em 0;
+ padding: .7em 1.5em;
- &.warning {
- background: #e60000;
- }
+ .banner__heading {
+ font-size: 1.5em;
}
- .popover {
- border-radius: 3px;
- font-size: .95em;
- width: 100%;
+ .banner__content {
+ width: 80%;
}
- .panel {
- background-color: transparent;
- border: none;
+ &.warning {
+ background: #e60000;
}
+ }
- .panel-default {
- > .panel-heading {
- background-color: transparent;
- padding: 10px 0;
- }
+ .popover {
+ border-radius: 3px;
+ font-size: .95em;
+ width: 100%;
+ }
- .panel-body {
- padding: 30px 0 10px;
- }
- }
+ .panel {
+ background-color: transparent;
+ border: none;
+ }
- .panel-group {
- margin-bottom: 50px;
+ .panel-default {
+ > .panel-heading {
+ background-color: transparent;
+ padding: 10px 0;
}
- .panel-title {
- font-size: 24px;
- line-height: 1.5;
+ .panel-body {
+ padding: 30px 0 10px;
+ }
+ }
- a {
- @include clearfix;
- display: block;
- text-decoration: none;
+ .panel-group {
+ margin-bottom: 50px;
+ }
- &.collapsed {
- .fa-minus {
- display: none;
- }
+ .panel-title {
+ font-size: 24px;
+ line-height: 1.5;
- .fa-plus {
- display: inline-block;
- }
- }
+ a {
+ @include clearfix;
+ display: block;
+ text-decoration: none;
- .fa {
- color: #aaa;
- float: right;
- font-size: 18px;
- margin-top: 8px;
+ &.collapsed {
+ .fa-minus {
+ display: none;
}
.fa-plus {
- display: none;
+ display: inline-block;
}
}
+
+ .fa {
+ color: #aaa;
+ float: right;
+ font-size: 18px;
+ margin-top: 8px;
+ }
+
+ .fa-plus {
+ display: none;
+ }
}
}
@@ -343,3 +225,108 @@
margin-bottom: 1.5em;
max-width: 150px;
}
+
+.admin-console__disabled-text {
+ color: #777;
+ margin: 10px 0 0 15px;
+}
+
+.admin-sidebar {
+ background: #333;
+ border-right: 1px solid #ddd;
+ height: 100%;
+ left: 0;
+ position: absolute;
+ width: 220px;
+ z-index: 5;
+
+ .team__header {
+ background: transparent;
+ }
+
+ .nav-pills__container {
+ background: #111;
+ @include font-smoothing(initial);
+ height: calc(100% - 80px);
+ margin-top: 1px;
+ position: relative;
+ }
+
+ .sidebar-category {
+ .category-title {
+ background: alpha-color($white, .15);
+ color: $white;
+ line-height: 15.4px;
+ padding: 10px;
+
+ .category-icon {
+ right: 12px;
+ top: 6px;
+ width: 17px;
+ }
+ }
+
+ .sections {
+ padding: 5px 0;
+ }
+ }
+
+ .sidebar-section-title {
+ padding: 5px 35px 5px 15px;
+ }
+
+ .sidebar-subsection-title {
+ padding: 5px 35px 5px 30px;
+ }
+
+ .sidebar-section-title,
+ .sidebar-subsection-title {
+ color: #bbb;
+ display: block;
+ font-size: 13px;
+ position: relative;
+
+ &:focus {
+ text-decoration: none;
+ }
+
+ &:hover {
+ color: lighten($primary-color, 10);
+ text-decoration: none;
+ }
+
+ &--active {
+ color: $white;
+ font-weight: 600;
+ }
+ }
+
+ .menu-icon--right {
+ font-size: 18px;
+ font-weight: 600;
+ height: 20px;
+ line-height: 20px;
+ position: absolute;
+ right: 12px;
+ text-align: center;
+ top: 8px;
+ width: 20px;
+
+ .fa {
+ color: $white;
+ font-size: 13px;
+ position: relative;
+ right: -2px;
+ }
+
+ &.menu__close {
+ cursor: pointer;
+ right: 10px;
+ top: 3px;
+ }
+ }
+}
+
+.email-connection-test {
+ margin-top: -15px;
+} \ No newline at end of file