IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

(S)CSS cleanup: 0px => O and removal of duplicated properties (#5526)

Browse Source
This commit is contained in:
Bruno Perel
2018-01-25 15:53:36 +01:00
committed by Kris
parent b784c1eda4
commit 6750ff6873
37 changed files with 77 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/common/admin/admin_base.scss
View File

@@ -194,7 +194,7 @@ $mobile-breakpoint: 700px;
.location-box { .location-box {
position: absolute; position: absolute;
width: 460px; width: 460px;
right: 0px; right: 0;
z-index: z("dropdown"); z-index: z("dropdown");
box-shadow: 0 2px 6px rgba(0,0,0, .8); box-shadow: 0 2px 6px rgba(0,0,0, .8);
margin-top: -2px; margin-top: -2px;
@@ -518,7 +518,7 @@ $mobile-breakpoint: 700px;
li.sortable-placeholder { li.sortable-placeholder {
padding: 3px 5px 3px 18px; padding: 3px 5px 3px 18px;
margin: 3px 0px 3px 5px; margin: 3px 0 3px 5px;
position: relative; position: relative;
line-height: $line-height-small; line-height: $line-height-small;
cursor: default; cursor: default;

4
app/assets/stylesheets/common/base/_topic-list.scss
View File

@@ -68,14 +68,14 @@
td { td {
border-bottom: 1px solid $danger-low; border-bottom: 1px solid $danger-low;
line-height: 0.1em; line-height: 0.1em;
padding: 0px; padding: 0;
text-align: center; text-align: center;
} }
td span { td span {
background-color: $secondary; background-color: $secondary;
color: $danger-low; color: $danger-low;
padding: 0px 8px; padding: 0 8px;
font-size: $font-down-1; font-size: $font-down-1;
} }
} }

6
app/assets/stylesheets/common/base/crawler_layout.scss
View File

@@ -9,10 +9,10 @@ body.crawler {
box-shadow: 0 2px 4px -1px rgba(0,0,0,0.25); box-shadow: 0 2px 4px -1px rgba(0,0,0,0.25);
} }
div.topic-list div[itemprop='itemListElement'] { div.topic-list div[itemprop='itemListElement'] {
padding: 10px 0px; padding: 10px 0;
border-bottom: 1px solid #e9e9e9; border-bottom: 1px solid #e9e9e9;
.page-links a { .page-links a {
padding: 0px 4px; padding: 0 4px;
} }
} }
div#main-outlet { div#main-outlet {
@@ -23,7 +23,7 @@ body.crawler {
} }
} }
footer nav { footer nav {
margin: 50px 0px; margin: 50px 0;
a { a {
padding: 15px; padding: 15px;
} }

4
app/assets/stylesheets/common/base/discourse.scss
View File

@@ -197,7 +197,7 @@ input {
border-radius: 0; border-radius: 0;
&:focus { &:focus {
border-color: $tertiary; border-color: $tertiary;
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
outline: 0; outline: 0;
} }
} }
@@ -209,7 +209,7 @@ textarea {
border: 1px solid $primary-medium; border: 1px solid $primary-medium;
&:focus { &:focus {
border-color: $tertiary; border-color: $tertiary;
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
outline: 0; outline: 0;
} }
} }

5
app/assets/stylesheets/common/base/emoji.scss
View File

@@ -54,7 +54,7 @@ img.emoji {
.emoji-picker .list { .emoji-picker .list {
overflow-y: scroll; overflow-y: scroll;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
padding: 0px; padding: 0;
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
} }
@@ -100,7 +100,6 @@ img.emoji {
.emoji-picker .info { .emoji-picker .info {
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 232px;
padding-left: 8px; padding-left: 8px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
@@ -155,8 +154,6 @@ img.emoji {
-moz-box-sizing: content-box; -moz-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
height: 20px; height: 20px;
margin: 0;
padding: 0;
border: 0; border: 0;
vertical-align: top; vertical-align: top;
width: 20px; width: 20px;

6
app/assets/stylesheets/common/base/group.scss
View File

@@ -95,11 +95,11 @@ table.group-logs {
th { th {
text-align: left; text-align: left;
padding: 5px 0px; padding: 5px 0;
} }
td { td {
padding: 10px 0px; padding: 10px 0;
} }
.group-logs-expand-details { .group-logs-expand-details {
@@ -131,7 +131,7 @@ table.group-members {
th { th {
border-bottom: 3px solid $primary-low; border-bottom: 3px solid $primary-low;
text-align: center; text-align: center;
padding: 5px 0px 5px 5px; padding: 5px 0 5px 5px;
color: dark-light-choose($primary-medium, $secondary-medium); color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal; font-weight: normal;
} }

4
app/assets/stylesheets/common/base/groups.scss
View File

@@ -1,6 +1,6 @@
.groups-page { .groups-page {
h1 { h1 {
margin: 20px 0px; margin: 20px 0;
} }
} }
@@ -9,7 +9,7 @@
th { th {
border-bottom: 1px solid $primary-low; border-bottom: 1px solid $primary-low;
padding: 5px 0px; padding: 5px 0;
text-align: left; text-align: left;
} }

2
app/assets/stylesheets/common/base/modal.scss
View File

@@ -379,7 +379,7 @@
textarea { textarea {
font-family: monospace; font-family: monospace;
resize: none; resize: none;
border-radius: 0px; border-radius: 0;
box-shadow: none; box-shadow: none;
} }
.incoming-email-html-part { .incoming-email-html-part {

6
app/assets/stylesheets/common/base/onebox.scss
View File

@@ -278,7 +278,7 @@ pre.onebox code ol.lines li:before {
pre.onebox code ol{ pre.onebox code ol{
margin-left:0px; margin-left:0;
line-height: $line-height-large; line-height: $line-height-large;
} }
pre.onebox code { pre.onebox code {
@@ -296,7 +296,7 @@ pre.onebox code ol.lines{
pre.onebox code ol.lines li { pre.onebox code ol.lines li {
list-style-type: none; list-style-type: none;
padding-left: 5px; padding-left: 5px;
margin-left: 0px; margin-left: 0;
border-left: 1px solid #CFCFCF; border-left: 1px solid #CFCFCF;
min-height: 1.5em; //show empty li lines min-height: 1.5em; //show empty li lines
white-space: pre; white-space: pre;
@@ -314,7 +314,7 @@ pre.onebox code {
.onebox-body .github-commit-status { .onebox-body .github-commit-status {
background: #F5F5F5; background: #F5F5F5;
border-radius: 5px; border-radius: 5px;
margin:0px 0px 5px 100px; margin:0 0 5px 100px;
padding: 10px; padding: 10px;
} }

2
app/assets/stylesheets/common/base/tagging.scss
View File

@@ -119,7 +119,7 @@ $tag-color: $primary-medium;
} }
&.simple, &.simple:visited, &.simple:hover { &.simple, &.simple:visited, &.simple:hover {
margin-right: 0px; margin-right: 0;
color: $primary-high; color: $primary-high;
} }
} }

2
app/assets/stylesheets/common/base/topic-post.scss
View File

@@ -448,7 +448,7 @@ blockquote > *:last-child {
.custom-message { .custom-message {
text-transform: none; text-transform: none;
margin: 15px 0px 5px; margin: 15px 0 5px;
font-weight: normal; font-weight: normal;
font-size: $font-up-1; font-size: $font-up-1;
p { p {

2
app/assets/stylesheets/common/base/topic.scss
View File

@@ -10,7 +10,7 @@
position: fixed; position: fixed;
bottom: 40px; bottom: 40px;
z-index: z("dropdown"); z-index: z("dropdown");
margin-right: 0px; margin-right: 0;
animation-duration: 0.5s; animation-duration: 0.5s;
animation-name: button-jump-up; animation-name: button-jump-up;
width: 145px; width: 145px;

2
app/assets/stylesheets/common/base/user.scss
View File

@@ -348,7 +348,7 @@
} }
.user-nav { .user-nav {
margin: 5px 0px; margin: 5px 0;
padding-top: 10px; padding-top: 10px;
li a { li a {

4
app/assets/stylesheets/common/base/username_tagsinput.scss
View File

@@ -32,8 +32,8 @@ div.tagsinput input {
padding:2px 5px; padding:2px 5px;
background: transparent; background: transparent;
color: #000; color: #000;
outline:0px; outline:0;
margin: 0px 5px 5px 0px; margin: 0 5px 5px 0;
} }
div.tagsinput div { display:block; float: left; } div.tagsinput div { display:block; float: left; }
.tags_clear { clear: both; width: 100%; height: 0; } .tags_clear { clear: both; width: 100%; height: 0; }

12
app/assets/stylesheets/common/select-kit/combo-box.scss
View File

@@ -32,8 +32,8 @@
&.is-focused { &.is-focused {
border: 1px solid $tertiary; border: 1px solid $tertiary;
-webkit-box-shadow: $tertiary 0px 0px 6px 0px; -webkit-box-shadow: $tertiary 0 0 6px 0px;
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
} }
} }
@@ -47,8 +47,8 @@
&.is-highlighted { &.is-highlighted {
.select-kit-header { .select-kit-header {
border: 1px solid $tertiary; border: 1px solid $tertiary;
-webkit-box-shadow: $tertiary 0px 0px 6px 0px; -webkit-box-shadow: $tertiary 0 0 6px 0px;
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
} }
} }
@@ -56,8 +56,8 @@
.select-kit-wrapper { .select-kit-wrapper {
display: block; display: block;
border: 1px solid $tertiary; border: 1px solid $tertiary;
-webkit-box-shadow: $tertiary 0px 0px 6px 0px; -webkit-box-shadow: $tertiary 0 0 6px 0px;
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
} }
.select-kit-header { .select-kit-header {

4
app/assets/stylesheets/common/select-kit/legacy-combo-box.scss
View File

@@ -79,10 +79,10 @@
} }
.select2-container-active { .select2-container-active {
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
} }
.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-selection-limit { .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-selection-limit {
background: $secondary; background: $secondary;
color: $primary; color: $primary;
} }

7
app/assets/stylesheets/common/select-kit/multi-select.scss
View File

@@ -24,7 +24,7 @@
border: 1px solid $primary-medium; border: 1px solid $primary-medium;
&.is-focused { &.is-focused {
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
border-radius: 0; border-radius: 0;
} }
} }
@@ -40,7 +40,7 @@
.multi-select-header { .multi-select-header {
border-radius: 0; border-radius: 0;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
} }
} }
@@ -48,7 +48,7 @@
.select-box-kit-wrapper, .select-kit-wrapper { .select-box-kit-wrapper, .select-kit-wrapper {
display: block; display: block;
border: 1px solid $tertiary; border: 1px solid $tertiary;
box-shadow: $tertiary 0px 0px 6px 0px; box-shadow: $tertiary 0 0 6px 0px;
border-radius: 0; border-radius: 0;
} }
@@ -126,7 +126,6 @@
.selected-name { .selected-name {
color: $primary; color: $primary;
cursor: default;
border: 1px solid $primary-medium; border: 1px solid $primary-medium;
border-radius: 3px; border-radius: 3px;
box-shadow: 0 0 2px $secondary inset, 0 1px 0 rgba(0,0,0,0.05); box-shadow: 0 0 2px $secondary inset, 0 1px 0 rgba(0,0,0,0.05);

9
app/assets/stylesheets/common/select-kit/select-kit.scss
View File

@@ -45,7 +45,7 @@
top: 0; top: 0;
} }
.select-kit-collection, { .select-kit-collection {
border-radius: inherit; border-radius: inherit;
} }
} }
@@ -91,7 +91,6 @@
flex-direction: row; flex-direction: row;
-webkit-box-pack: justify; -webkit-box-pack: justify;
-ms-flex-pack: justify; -ms-flex-pack: justify;
justify-content: space-between;
.selected-name { .selected-name {
text-align: left; text-align: left;
@@ -106,7 +105,7 @@
} }
.btn-clear { .btn-clear {
padding: 0px 10px; padding: 0 10px;
border: 0; border: 0;
background: none; background: none;
} }
@@ -261,8 +260,8 @@
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
outline: 0; outline: 0;
left: 0px; left: 0;
top: 0px; top: 0;
} }
} }

1
app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
View File

@@ -34,7 +34,6 @@
.name, .d-icon { .name, .d-icon {
color: $secondary; color: $secondary;
color: $secondary;
} }
} }

2
app/assets/stylesheets/common/topic-entrance.scss
View File

@@ -3,7 +3,7 @@
border: 1px solid $primary-low; border: 1px solid $primary-low;
padding: 5px; padding: 5px;
background: $secondary; background: $secondary;
box-shadow: 0 0px 2px rgba(0,0,0, .2); box-shadow: 0 0 2px rgba(0,0,0, .2);
z-index: z("dropdown"); z-index: z("dropdown");
position: absolute; position: absolute;

2
app/assets/stylesheets/common/topic-timeline.scss
View File

@@ -108,7 +108,7 @@
} }
} }
.timeline-last-read { .timeline-last-read {
right: 0px; right: 0;
margin-left: 0; margin-left: 0;
i.progress { i.progress {
display: none display: none

2
app/assets/stylesheets/desktop/compose.scss
View File

@@ -47,7 +47,7 @@
.open { .open {
.grippie { .grippie {
cursor: row-resize; cursor: row-resize;
padding: 4px 0px; padding: 4px 0;
background: $tertiary; background: $tertiary;
&:before { &:before {
content: ''; content: '';

2
app/assets/stylesheets/desktop/discourse.scss
View File

@@ -60,7 +60,7 @@ h4,
h5, h5,
h6 { h6 {
+ p { + p {
margin-top:0px; margin-top:0;
} }
} }

4
app/assets/stylesheets/desktop/topic-post.scss
View File

@@ -908,7 +908,7 @@ a.attachment:before {
.who-liked { .who-liked {
margin-top: 20px; margin-top: 20px;
margin-bottom: 0px; margin-bottom: 0;
width: 100%; width: 100%;
text-align: right; text-align: right;
} }
@@ -924,7 +924,7 @@ span.highlighted {
.read-state { .read-state {
color: $tertiary-medium; color: $tertiary-medium;
position: absolute; position: absolute;
right: 0px; right: 0;
top: 2em; top: 2em;
font-size: 0.571em; font-size: 0.571em;
} }

3
app/assets/stylesheets/desktop/topic.scss
View File

@@ -71,7 +71,7 @@
.topic-status-info { .topic-status-info {
border-top: 1px solid $primary-low; border-top: 1px solid $primary-low;
padding: 10px 0px; padding: 10px 0;
height: 20px; height: 20px;
max-width: 757px; max-width: 757px;
} }
@@ -96,7 +96,6 @@
position: relative; position: relative;
left: 340px; left: 340px;
width: 135px; width: 135px;
padding: 5px;
button.full { button.full {
width: 100%; width: 100%;

4
app/assets/stylesheets/desktop/user.scss
View File

@@ -111,7 +111,7 @@
.user-invite-controls { .user-invite-controls {
background-color: $primary-low; background-color: $primary-low;
padding: 5px 10px 0px 0; padding: 5px 10px 0 0;
height: 35px; height: 35px;
} }
@@ -134,7 +134,7 @@
&.group { &.group {
.details { .details {
padding: 15px 0px; padding: 15px 0;
margin: 0; margin: 0;
color: dark-light-choose(lighten($primary, 10%), $secondary); color: dark-light-choose(lighten($primary, 10%), $secondary);
} }

4
app/assets/stylesheets/mobile/discourse.scss
View File

@@ -79,7 +79,7 @@ blockquote {
&.activity-nav, &.activity-nav,
&.preferences-nav { &.preferences-nav {
position: absolute; position: absolute;
right: 0px; right: 0;
top: -57px; top: -57px;
} }
@@ -103,7 +103,7 @@ blockquote {
.d-icon-caret-down { .d-icon-caret-down {
position: absolute; position: absolute;
right: 0px; right: 0;
} }
.drop { .drop {

8
app/assets/stylesheets/mobile/group.scss
View File

@@ -3,11 +3,11 @@
} }
.group-header { .group-header {
margin: 0px; margin: 0;
} }
.group-name { .group-name {
margin: 5px 0px 0px 0px; margin: 5px 0 0 0;
} }
.group-nav { .group-nav {
@@ -29,7 +29,7 @@
.group-activity-nav.mobile-nav { .group-activity-nav.mobile-nav {
position: absolute; position: absolute;
right: 0px; right: 0;
top: -55px; top: -55px;
} }
@@ -44,7 +44,7 @@
.group-flair-inputs { .group-flair-inputs {
.group-flair-right { .group-flair-right {
margin: 0px margin: 0
} }
} }
} }

4
app/assets/stylesheets/mobile/modal.scss
View File

@@ -55,12 +55,12 @@
} }
.modal-header { .modal-header {
padding: 10px 0px 10px 10px; padding: 10px 0 10px 10px;
h3 { h3 {
display: inline; display: inline;
font-size: $font-up-2; font-size: $font-up-2;
margin: 0px; margin: 0;
} }
} }
.close { .close {

4
app/assets/stylesheets/mobile/topic.scss
View File

@@ -38,7 +38,7 @@
/* both blocks that appear under the standard post control buttons */ /* both blocks that appear under the standard post control buttons */
.notification-options, .pinned-options { .notification-options, .pinned-options {
float: left; float: left;
margin-top: 0px; margin-top: 0;
padding-top: 1px; padding-top: 1px;
clear: both; clear: both;
} }
@@ -223,4 +223,4 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
.btn.pull-right { .btn.pull-right {
margin-right: 0; margin-right: 0;
} }
} }

3
app/assets/stylesheets/vendor/bootstrap.scss vendored
View File

@@ -129,7 +129,6 @@ input[type="submit"].btn::-moz-focus-inner {
margin: 1px 0 0; margin: 1px 0 0;
list-style: none; list-style: none;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 5px; border-radius: 5px;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@@ -213,7 +212,7 @@ body {
// this removes the unwanted top margin on a paragraph under a heading // this removes the unwanted top margin on a paragraph under a heading
h1+p, h2+p, h3+p, h4+p, h5+p, h6+p { h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
margin-top:0px; margin-top:0;
} }
blockquote { blockquote {

5
app/assets/stylesheets/vendor/select2.scss vendored
View File

@@ -402,7 +402,6 @@ disabled look for disabled choices in the results dropdown
.select2-container-multi .select2-choices { .select2-container-multi .select2-choices {
height: auto !important; height: auto !important;
height: 1%;
margin: 0; margin: 0;
padding: 0 5px 0 0; padding: 0 5px 0 0;
position: relative; position: relative;
@@ -558,8 +557,8 @@ html[dir="rtl"] .select2-search-choice-close {
overflow: hidden !important; overflow: hidden !important;
position: absolute !important; position: absolute !important;
outline: 0 !important; outline: 0 !important;
left: 0px !important; left: 0 !important;
top: 0px !important; top: 0 !important;
} }
.select2-display-none { .select2-display-none {

26
app/assets/stylesheets/vendor/sweetalert.scss vendored
View File

@@ -52,7 +52,6 @@ body.stop-scrolling {
.sweet-alert p { .sweet-alert p {
color: #797979; color: #797979;
font-size: 16px; font-size: 16px;
text-align: center;
font-weight: 300; font-weight: 300;
position: relative; position: relative;
text-align: inherit; text-align: inherit;
@@ -132,14 +131,14 @@ body.stop-scrolling {
margin-top: 10px; margin-top: 10px;
margin-bottom: 17px; margin-bottom: 17px;
font-size: 18px; font-size: 18px;
box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.06); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.06);
padding: 0 12px; padding: 0 12px;
display: none; display: none;
-webkit-transition: all 0.3s; -webkit-transition: all 0.3s;
transition: all 0.3s; } transition: all 0.3s; }
.sweet-alert input:focus { .sweet-alert input:focus {
outline: none; outline: none;
box-shadow: 0px 0px 3px #c4e6f5; box-shadow: 0 0 3px #c4e6f5;
border: 1px solid #b4dbed; } border: 1px solid #b4dbed; }
.sweet-alert input:focus::-moz-placeholder { .sweet-alert input:focus::-moz-placeholder {
transition: opacity 0.3s 0.03s ease; transition: opacity 0.3s 0.03s ease;
@@ -195,7 +194,7 @@ body.stop-scrolling {
.sweet-alert button.cancel:active { .sweet-alert button.cancel:active {
background-color: #a8a8a8; } background-color: #a8a8a8; }
.sweet-alert button.cancel:focus { .sweet-alert button.cancel:focus {
box-shadow: rgba(197, 205, 211, 0.8) 0px 0px 2px, rgba(0, 0, 0, 0.0470588) 0px 0px 0px 1px inset !important; } box-shadow: rgba(197, 205, 211, 0.8) 0 0 2px, rgba(0, 0, 0, 0.0470588) 0 0 0 1px inset !important; }
.sweet-alert button[disabled] { .sweet-alert button[disabled] {
opacity: .6; opacity: .6;
cursor: default; } cursor: default; }
@@ -216,7 +215,6 @@ body.stop-scrolling {
height: 80px; height: 80px;
border: 4px solid gray; border: 4px solid gray;
-webkit-border-radius: 40px; -webkit-border-radius: 40px;
border-radius: 40px;
border-radius: 50%; border-radius: 50%;
margin: 20px auto; margin: 20px auto;
padding: 0; padding: 0;
@@ -291,7 +289,6 @@ body.stop-scrolling {
.sweet-alert .sa-icon.sa-success::before, .sweet-alert .sa-icon.sa-success::after { .sweet-alert .sa-icon.sa-success::before, .sweet-alert .sa-icon.sa-success::after {
content: ''; content: '';
-webkit-border-radius: 40px; -webkit-border-radius: 40px;
border-radius: 40px;
border-radius: 50%; border-radius: 50%;
position: absolute; position: absolute;
width: 60px; width: 60px;
@@ -315,14 +312,13 @@ body.stop-scrolling {
left: 30px; left: 30px;
-webkit-transform: rotate(-45deg); -webkit-transform: rotate(-45deg);
transform: rotate(-45deg); transform: rotate(-45deg);
-webkit-transform-origin: 0px 60px; -webkit-transform-origin: 0 60px;
transform-origin: 0px 60px; } transform-origin: 0 60px; }
.sweet-alert .sa-icon.sa-success .sa-placeholder { .sweet-alert .sa-icon.sa-success .sa-placeholder {
width: 80px; width: 80px;
height: 80px; height: 80px;
border: 4px solid rgba(165, 220, 134, 0.2); border: 4px solid rgba(165, 220, 134, 0.2);
-webkit-border-radius: 40px; -webkit-border-radius: 40px;
border-radius: 40px;
border-radius: 50%; border-radius: 50%;
box-sizing: content-box; box-sizing: content-box;
position: absolute; position: absolute;
@@ -414,13 +410,13 @@ body.stop-scrolling {
@-webkit-keyframes slideFromTop { @-webkit-keyframes slideFromTop {
0% { 0% {
top: 0%; } top: 0; }
100% { 100% {
top: 50%; } } top: 50%; } }
@keyframes slideFromTop { @keyframes slideFromTop {
0% { 0% {
top: 0%; } top: 0; }
100% { 100% {
top: 50%; } } top: 50%; } }
@@ -428,13 +424,13 @@ body.stop-scrolling {
0% { 0% {
top: 50%; } top: 50%; }
100% { 100% {
top: 0%; } } top: 0; } }
@keyframes slideToTop { @keyframes slideToTop {
0% { 0% {
top: 50%; } top: 50%; }
100% { 100% {
top: 0%; } } top: 0; } }
@-webkit-keyframes slideFromBottom { @-webkit-keyframes slideFromBottom {
0% { 0% {
@@ -547,7 +543,7 @@ body.stop-scrolling {
top: 54px; } top: 54px; }
84% { 84% {
width: 55px; width: 55px;
right: 0px; right: 0;
top: 35px; } top: 35px; }
100% { 100% {
width: 47px; width: 47px;
@@ -565,7 +561,7 @@ body.stop-scrolling {
top: 54px; } top: 54px; }
84% { 84% {
width: 55px; width: 55px;
right: 0px; right: 0;
top: 35px; } top: 35px; }
100% { 100% {
width: 47px; width: 47px;

2
app/assets/stylesheets/wizard.scss
View File

@@ -195,7 +195,7 @@ body.wizard {
.wizard-btn { .wizard-btn {
border-radius: 2px; border-radius: 2px;
font-size: $font-0; font-size: $font-0;
border: 0px; border: 0;
padding: 0.5em; padding: 0.5em;
transition: background-color .3s; transition: background-color .3s;
margin-right: 0.5em; margin-right: 0.5em;

2
plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
View File

@@ -1,5 +1,5 @@
.poll-ui-builder-form { .poll-ui-builder-form {
margin: 0px; margin: 0;
.input-group { .input-group {
padding: 10px; padding: 10px;

2
plugins/poll/assets/stylesheets/common/poll.scss
View File

@@ -4,7 +4,7 @@ $text-color: #9E9E9E;
$option-background: dark-light-diff($primary, $secondary, 90%, -65%); $option-background: dark-light-diff($primary, $secondary, 90%, -65%);
div.poll { div.poll {
margin: 10px 0px; margin: 10px 0;
border: 1px solid $border-color; border: 1px solid $border-color;
@include unselectable; @include unselectable;

2
public/javascripts/spectrum.css
View File

@@ -113,7 +113,7 @@ License: MIT
.sp-clear-enabled .sp-clear { .sp-clear-enabled .sp-clear {
display: block; display: block;
position:absolute; position:absolute;
top:0px; top:0;
right:0; right:0;
bottom:0; bottom:0;
left:84%; left:84%;