summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-05 07:31:37 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-05 07:31:37 -0500
commit40eea5b5e31c807345b7e33e0faedbf8d00eab93 (patch)
tree9bd0949958978ae130ccf2e17bae6a59cc5a629b /web/sass-files
parent72a18e7d1093effbfee6845254470b6842a92236 (diff)
parenta809ff88625e0fbaab8d14e2d35e85abd8fe6111 (diff)
downloadchat-40eea5b5e31c807345b7e33e0faedbf8d00eab93.tar.gz
chat-40eea5b5e31c807345b7e33e0faedbf8d00eab93.tar.bz2
chat-40eea5b5e31c807345b7e33e0faedbf8d00eab93.zip
Merge pull request #1308 from asaadmahmoodspin/plt-960
Plt 960 - Moving code themes into custom themes
Diffstat (limited to 'web/sass-files')
-rw-r--r--web/sass-files/sass/partials/_access-history.scss4
-rw-r--r--web/sass-files/sass/partials/_activity-log.scss4
-rw-r--r--web/sass-files/sass/partials/_settings.scss9
3 files changed, 11 insertions, 6 deletions
diff --git a/web/sass-files/sass/partials/_access-history.scss b/web/sass-files/sass/partials/_access-history.scss
index a3289ecc0..c8a0b28bd 100644
--- a/web/sass-files/sass/partials/_access-history.scss
+++ b/web/sass-files/sass/partials/_access-history.scss
@@ -19,10 +19,6 @@
border-bottom: 1px solid #ddd;
padding-bottom: 15px;
}
- .report__time {
- font-weight: 600;
- font-size: 15px;
- }
.report__info {
@include opacity(0.8);
}
diff --git a/web/sass-files/sass/partials/_activity-log.scss b/web/sass-files/sass/partials/_activity-log.scss
index 2fb37a3bb..f61c35a28 100644
--- a/web/sass-files/sass/partials/_activity-log.scss
+++ b/web/sass-files/sass/partials/_activity-log.scss
@@ -36,7 +36,7 @@
text-align: right;
}
.report__platform {
- font-size: 16px;
+ font-size: 15px;
font-weight: 600;
.fa {
margin-right: 6px;
@@ -47,5 +47,5 @@
}
}
.session-help-text {
- padding: 20px 20px 5px 20px;
+ padding: 0 0 20px;
} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 3be83ed2f..b304450bc 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -125,6 +125,15 @@
}
.appearance-section {
+ .theme-group {
+ .input-group-addon {
+ padding: 4px 5px;
+ width: 40px;
+ img {
+ border: 1px solid rgba(black, 0.15);
+ }
+ }
+ }
.premade-themes {
margin-bottom: 10px;
.theme-label {