diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-05-12 12:11:02 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-12 12:11:02 -0400 |
commit | d1efb66ad7b017f0fbfe6f0c20843b30f396e504 (patch) | |
tree | 5b48a38382015de815b2d45d58836c5ca06b631c /webapp/sass/routes | |
parent | 3f0325fd223dcb3a6eec92f772df1e7541ab0b2b (diff) | |
parent | 9a701b7e5b31ca803a2d92f0b3b1d7cc68bf3c37 (diff) | |
download | chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.tar.gz chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.tar.bz2 chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.zip |
Merge branch 'release-3.0'
Diffstat (limited to 'webapp/sass/routes')
-rw-r--r-- | webapp/sass/routes/_admin-console.scss | 11 | ||||
-rw-r--r-- | webapp/sass/routes/_compliance.scss | 38 | ||||
-rw-r--r-- | webapp/sass/routes/_module.scss | 1 |
3 files changed, 39 insertions, 11 deletions
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss index 65fefdb33..0f47e7529 100644 --- a/webapp/sass/routes/_admin-console.scss +++ b/webapp/sass/routes/_admin-console.scss @@ -160,17 +160,6 @@ width: 100%; } - .compliance__panel, - .audit__panel { - background-color: $white; - border: 1px solid $border-gray; - height: 70vh; - margin-top: 10px; - overflow: auto; - padding: 5px; - width: 100%; - } - .app__content { color: #333; diff --git a/webapp/sass/routes/_compliance.scss b/webapp/sass/routes/_compliance.scss new file mode 100644 index 000000000..57eb538c6 --- /dev/null +++ b/webapp/sass/routes/_compliance.scss @@ -0,0 +1,38 @@ +@charset 'UTF-8'; + +.compliance-panel__table, +.audit-panel__table { + background-color: $white; + border: 1px solid $border-gray; + margin-top: 10px; + max-height: 70vh; + min-height: 100px; + overflow: auto; + padding: 5px; + width: 100%; +} + +.compliance-panel, +.audit-panel { + .row { + > .form-group { + padding-left: 0; + + &:first-child { + padding-left: 15px; + } + } + + label { + font-weight: 600; + } + } + + .fa-refresh { + margin-right: 5px; + } +} + +.compliance-panel { + margin-bottom: 3em; +} diff --git a/webapp/sass/routes/_module.scss b/webapp/sass/routes/_module.scss index 4f3f6f9cd..11b815007 100644 --- a/webapp/sass/routes/_module.scss +++ b/webapp/sass/routes/_module.scss @@ -4,6 +4,7 @@ @import 'activity-log'; @import 'admin-console'; @import 'backstage'; +@import 'compliance'; @import 'docs'; @import 'error-page'; @import 'loading'; |