From 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 23 Sep 2015 12:49:28 -0700 Subject: PLT-349 adding team mgt to admin console --- web/sass-files/sass/partials/_admin-console.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index 9823d2611..e0019eb9b 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -19,6 +19,11 @@ background-color: $primary-color; } } + > h4 { + background: #333; + padding: 10px 10px; + margin-top: 1px; + } } .menu-icon--right { vertical-align: top; @@ -29,10 +34,10 @@ font-size: 13px; right: -2px; position: relative; + color: #fff; } } &.nav__sub-menu { - padding: 5px 0; background: #111; -webkit-font-smoothing: auto; li { @@ -88,6 +93,7 @@ overflow: auto; background-color: #f1f1f1; padding: 0 20px 20px; + min-height: 600px; } .wrapper--fixed { max-width: 800px; -- cgit v1.2.3-1-g7c22 From 511fcce55345adb2a6b05cf058fd4d238abcc521 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Wed, 23 Sep 2015 17:42:57 -0400 Subject: Restricted markdown output to only appear on one line when in singleline mode --- web/sass-files/sass/partials/_markdown.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index c09e9d7b4..bccea6e0e 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -1,6 +1,12 @@ .markdown__heading { font-weight: bold; } +.markdown__paragraph-inline { + display: inline; + + .markdown__paragraph-inline { + margin-left: 4px; + } +} .markdown__table { background: #fff; margin: 5px 0 10px; @@ -25,4 +31,4 @@ pre { code { color: #c7254e; } -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From 5183103e8f62187034b95d5c99cc2b7c0b29e947 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 24 Sep 2015 18:55:53 +0500 Subject: plt-363 - Adding organisation theme --- web/sass-files/sass/partials/_base.scss | 10 ++++++++-- web/sass-files/sass/partials/_files.scss | 9 ++++----- web/sass-files/sass/partials/_markdown.scss | 5 ++++- web/sass-files/sass/partials/_mentions.scss | 1 + web/sass-files/sass/partials/_modal.scss | 9 +++++++++ web/sass-files/sass/partials/_post.scss | 7 +++++-- 6 files changed, 31 insertions(+), 10 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 592d5e62e..50946ed83 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -34,8 +34,14 @@ body { } } -b, strong { - font-weight: 600; +.popover { + color: #333; + a { + color: $primary-color; + &:hover, &:focus { + color: $primary-color; + } + } } a { diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 405265f92..6dbb82810 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -157,23 +157,23 @@ border-left: 1px solid #ddd; font-size: 13px; padding: 7px; + color: #333; .post-image__name { margin-bottom: 3px; display: block; - color: #333; } .post-image__download { display: inline-block; padding-right: 7px; cursor: pointer; - color: #555; + @include opacity(0.7); } .post-image__type { - color: grey; + @include opacity(0.6); } .post-image__size { margin-left: 4px; - color: grey; + @include opacity(0.6); } } a { @@ -214,4 +214,3 @@ } } } - diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index bccea6e0e..de92e9d20 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -1,5 +1,5 @@ .markdown__heading { - font-weight: bold; + font-weight: 700; } .markdown__paragraph-inline { display: inline; @@ -32,3 +32,6 @@ pre { color: #c7254e; } } +code { + background: #fff; +} diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index aa893c535..a86cb8a73 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -65,6 +65,7 @@ .mention-highlight { background-color:#fff2bb; + color: #333; } .mention-link { diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 38e9b4174..62067c3b8 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -3,6 +3,7 @@ } .modal { width: 100%; + color: #333; &.image_modal { .modal-backdrop.in { @include opacity(0.7); @@ -11,6 +12,14 @@ a, a:focus, a:hover { color: #2389D7; } + .custom-textarea { + color: inherit; + border-color: #ccc; + &:focus { + border-color: #ccc; + box-shadow: none; + } + } .btn.btn-primary { background: #4285f4; &:hover, &:focus, &:active { diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index d4f02cf4b..e362e8f7a 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -2,13 +2,17 @@ white-space:pre-wrap; word-wrap:break-word; background:transparent; - border:1px solid #ccc !important; + border:1px solid #ccc; position:absolute; top:0px; height:auto; resize: none; line-height:20px; min-height:36px; + &:focus { + border-color: #ccc; + box-shadow: none; + } } .bad-connection { @@ -235,7 +239,6 @@ body.ios { } } textarea { - border: none; box-shadow: none; } } -- cgit v1.2.3-1-g7c22 From c5d78f828a48ba88b8a89a0564bcb8352e84b396 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 24 Sep 2015 10:17:58 -0400 Subject: Converting preview image modal to use react-bootstrap. Fixes issue where modal would appear behind background on iOS --- web/sass-files/sass/partials/_modal.scss | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 62067c3b8..b0d5a0f7d 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -190,16 +190,13 @@ position: relative; max-width: 90%; min-height: 100px; - min-width: 320px; + min-width: 240px; @include border-radius(3px); display: table; margin: 0 auto; &:hover { @include border-radius(3px 3px 0 0); } - &:hover .modal-close { - @include opacity(1); - } &.default { width: 100%; height: 80%; @@ -213,8 +210,15 @@ right: -13px; top: -13px; @include opacity(0); + -webkit-transition: opacity 0.6s; + -moz-transition: opacity 0.6s; + -o-transition: opacity 0.6s; + transition: opacity 0.6s; cursor: pointer; z-index: 9999; + &.modal-close--show { + @include opacity(1); + } } > a { background: #FFF; @@ -226,7 +230,7 @@ max-height: 100%; } } - .image-content { + .modal-content{ box-shadow: none; background: rgba(0, 0, 0, 0); width: 100%; @@ -310,6 +314,7 @@ } } + // Invite New Member .invite { margin-right: 40px; @@ -324,4 +329,4 @@ padding-left: 0; } } -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From 1ca84a8f8a2af05d39abbd888823faf62c7840b4 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 24 Sep 2015 21:05:21 +0500 Subject: plt-298 - Improving UI for webhooks --- web/sass-files/sass/partials/_base.scss | 4 ++++ web/sass-files/sass/partials/_modal.scss | 16 +++++++++++----- web/sass-files/sass/partials/_settings.scss | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 50946ed83..87d9b8200 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -44,6 +44,10 @@ body { } } +.word-break--all { + word-break: break-all; +} + a { word-break: break-word; color: $primary-color; diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index b0d5a0f7d..e4e8b20b6 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -11,6 +11,9 @@ } a, a:focus, a:hover { color: #2389D7; + &.text-danger { + color: #a94442; + } } .custom-textarea { color: inherit; @@ -20,11 +23,14 @@ box-shadow: none; } } - .btn.btn-primary { - background: #4285f4; - &:hover, &:focus, &:active { - background: $primary-color--hover; - color: #fff; + .btn { + font-size: 13px; + &.btn-primary { + background: #4285f4; + &:hover, &:focus, &:active { + background: $primary-color--hover; + color: #fff; + } } } .info__label { diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 8dcd8f35c..3aab05d70 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -32,6 +32,7 @@ } .settings-table { display: table; + table-layout: fixed; width: 100%; > div { display: table-cell; @@ -125,6 +126,10 @@ } } + .font--small { + font-size: 13px; + } + .section-describe { color:grey; } @@ -155,8 +160,18 @@ .has-error { color: #a94442; } + .padding-top { + padding-top: 7px; + &.x2 { + padding-top: 14px; + } + } .control-label { color: #555; + font-weight: 600; + &.text-left { + text-align: left; + } } hr { border-color: #ccc; -- cgit v1.2.3-1-g7c22 From b1a7225f30e8443f87830a578c306b8f93e6587f Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 25 Sep 2015 16:38:11 +0500 Subject: Bug fixes and UI improvements for multiple tickets --- web/sass-files/sass/partials/_markdown.scss | 38 ++++++++++++++++++++++++--- web/sass-files/sass/partials/_mentions.scss | 4 --- web/sass-files/sass/partials/_post.scss | 7 ++--- web/sass-files/sass/partials/_responsive.scss | 2 +- web/sass-files/sass/partials/_videos.scss | 9 +++---- 5 files changed, 43 insertions(+), 17 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index de92e9d20..122586354 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -2,10 +2,20 @@ font-weight: 700; } .markdown__paragraph-inline { - display: inline; - + .markdown__paragraph-inline { - margin-left: 4px; - } + display: inline; + + .markdown__paragraph-inline { + margin-left: 4px; + } +} +.post-body { + hr { + height: 4px; + padding: 0; + margin: 15px 0 16px; + background-color: #e7e7e7; + border: 0 none; + @include opacity(0.2); + } } .markdown__table { background: #fff; @@ -21,6 +31,26 @@ } } } +blockquote { + border: none; + position: relative; + font-size: 16px; + padding: 10px 10px 10px 38px; + margin-bottom: 0; + &:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + display: inline-block; + text-decoration: inherit; + content: "\f10d"; + left: 8px; + top: 5px; + position: absolute; + font-size: 20px; + @include opacity(0.6); + } +} pre { border: none; background-color: #f7f7f7; diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index a86cb8a73..83cdde53b 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -66,8 +66,4 @@ .mention-highlight { background-color:#fff2bb; color: #333; -} - -.mention-link { - color:$primary-color; } \ No newline at end of file diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index e362e8f7a..a1958af3b 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -185,7 +185,7 @@ body.ios { .post-create__container { form { width: 100%; - padding: 0 1em; + padding: 10px 1em 0 1em; margin: 0; } .post-create-body { @@ -229,12 +229,13 @@ body.ios { right: 0; position: absolute; top: 1px; - color: #999; + color: #444; + @include opacity(0.5); @include single-transition(all, 0.15s); font-size: 16px; padding: 7px 9px 6px; &:hover, &:active { - color: #444; + @include opacity(0.9); box-shadow: none; } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index d29c653ff..e0b35d0bf 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -417,7 +417,7 @@ padding: 0 1em; } form { - padding: 0; + padding: 10px 0 0 0; } .post-create-body { padding-bottom: 10px; diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss index de18aa08a..6d5d929be 100644 --- a/web/sass-files/sass/partials/_videos.scss +++ b/web/sass-files/sass/partials/_videos.scss @@ -19,7 +19,7 @@ } .video-type { - color:grey; + @include opacity(0.8); font-size:15px; font-weight:200; margin:0px; @@ -27,10 +27,9 @@ } .video-uploader { - font-size:15px; - margin-top:3px; - margin-bottom:0px; - padding:0px; + font-size: 15px; + margin: 18px 0 15px; + font-weight: 600; } .video-title { -- cgit v1.2.3-1-g7c22 From 6d87e9cd024b3fe19c63aaf1a5aaf6861189e47e Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 25 Sep 2015 16:44:36 +0500 Subject: Improving uploader name and video type for videos --- web/sass-files/sass/partials/_videos.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss index 6d5d929be..40d0157c1 100644 --- a/web/sass-files/sass/partials/_videos.scss +++ b/web/sass-files/sass/partials/_videos.scss @@ -21,15 +21,13 @@ .video-type { @include opacity(0.8); font-size:15px; - font-weight:200; margin:0px; padding:0px; } .video-uploader { - font-size: 15px; - margin: 18px 0 15px; - font-weight: 600; + font-size: 13px; + margin: 0 0 15px; } .video-title { -- cgit v1.2.3-1-g7c22 From bba626430485abb54cfd89140754546c61a81d6a Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 25 Sep 2015 16:52:48 +0500 Subject: Adding margin bot to videos --- web/sass-files/sass/partials/_videos.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss index 40d0157c1..9e1ce29b7 100644 --- a/web/sass-files/sass/partials/_videos.scss +++ b/web/sass-files/sass/partials/_videos.scss @@ -1,6 +1,7 @@ .video-div { position:relative; max-width: 480px; + margin-bottom: 8px; .video-thumbnail { max-width: 100%; height: auto; -- cgit v1.2.3-1-g7c22 From 9d1dddb7f4cd6ee9682bb48d88f5f0271a72dcba Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 25 Sep 2015 22:44:36 +0500 Subject: plt-366 - Adding Windows 8 theme --- web/sass-files/sass/partials/_loading.scss | 2 +- web/sass-files/sass/partials/_post.scss | 4 ++-- web/sass-files/sass/partials/_responsive.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_loading.scss b/web/sass-files/sass/partials/_loading.scss index d71055722..ab8601df6 100644 --- a/web/sass-files/sass/partials/_loading.scss +++ b/web/sass-files/sass/partials/_loading.scss @@ -37,4 +37,4 @@ to { opacity: 0.1; } } } -} +} \ No newline at end of file diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index a1958af3b..7532875d6 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -185,7 +185,7 @@ body.ios { .post-create__container { form { width: 100%; - padding: 10px 1em 0 1em; + padding: 0 1em; margin: 0; } .post-create-body { @@ -257,7 +257,7 @@ body.ios { line-height: 18px; display: inline-block; font-size: 13px; - color: #777; + @include opacity(0.6); } } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index e0b35d0bf..d29c653ff 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -417,7 +417,7 @@ padding: 0 1em; } form { - padding: 10px 0 0 0; + padding: 0; } .post-create-body { padding-bottom: 10px; -- cgit v1.2.3-1-g7c22 From 0899280112aa50287c4326cc66da5bf1c73058a7 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 28 Sep 2015 10:07:36 +0500 Subject: PLT-441 - Minor Ui touches to the admin console --- web/sass-files/sass/partials/_admin-console.scss | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index e0019eb9b..11794a269 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -1,5 +1,5 @@ -.sidebar--left { - &.sidebar--collapsable { + +.sidebar--left { &.sidebar--collapsable { background: #333; .team__header { background: transparent; @@ -9,7 +9,7 @@ li { padding: 0; .icon { - width: 15px; + width: 17px; } > a { color: #fff; @@ -22,7 +22,7 @@ > h4 { background: #333; padding: 10px 10px; - margin-top: 1px; + margin: 1px 0 0; } } .menu-icon--right { @@ -40,6 +40,9 @@ &.nav__sub-menu { background: #111; -webkit-font-smoothing: auto; + &.padded { + padding: 5px 0; + } li { > a { font-size: 13px; -- cgit v1.2.3-1-g7c22 From 40194b6a4806dfc55cdff87c91f77b292521528b Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 28 Sep 2015 10:34:08 +0500 Subject: Adding mention link styling back --- web/sass-files/sass/partials/_mentions.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index 83cdde53b..48746ba01 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -63,6 +63,10 @@ padding-left: 10px; } +.mention-link { + color: $primary-color; +} + .mention-highlight { background-color:#fff2bb; color: #333; -- cgit v1.2.3-1-g7c22