From 766d6aac44acba4f73b1e9442e8a6f6898fd1f46 Mon Sep 17 00:00:00 2001 From: David Yip Date: Thu, 18 Jan 2018 10:54:50 -0600 Subject: [PATCH] Strip trailing whitespace on win95.scss --- app/javascript/styles/win95.scss | 125 +++++++++++++++---------------- 1 file changed, 60 insertions(+), 65 deletions(-) diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss index f04a43c036e..c1058af292c 100644 --- a/app/javascript/styles/win95.scss +++ b/app/javascript/styles/win95.scss @@ -22,7 +22,7 @@ $ui-highlight-color: $win95-window-header; } @mixin win95-outset() { - box-shadow: inset -1px -1px 0px #000000, + box-shadow: inset -1px -1px 0px #000000, inset 1px 1px 0px #ffffff, inset -2px -2px 0px #808080, inset 2px 2px 0px #dfdfdf; @@ -46,7 +46,7 @@ $ui-highlight-color: $win95-window-header; } @mixin win95-inset() { - box-shadow: inset 1px 1px 0px #000000, + box-shadow: inset 1px 1px 0px #000000, inset -1px -1px 0px #ffffff, inset 2px 2px 0px #808080, inset -2px -2px 0px #dfdfdf; @@ -54,9 +54,8 @@ $ui-highlight-color: $win95-window-header; border-radius:0px; } - @mixin win95-tab() { - box-shadow: inset -1px 0px 0px #000000, + box-shadow: inset -1px 0px 0px #000000, inset 1px 0px 0px #ffffff, inset 0px 1px 0px #ffffff, inset 0px 2px 0px #dfdfdf, @@ -122,7 +121,6 @@ $ui-highlight-color: $win95-window-header; vertical-align: middle; } - /* main win95 style */ body { @@ -179,7 +177,7 @@ body.admin { font-size:0px; color:$win95-bg; - background-image: url("~images/start.png"); + background-image: url("~images/start.png"); background-repeat:no-repeat; background-position:8%; background-clip:padding-box; @@ -379,7 +377,7 @@ body.admin { border-radius:0px; background-color:white; @include win95-border-inset(); - + width:12px; height:12px; } @@ -558,9 +556,9 @@ body.admin { color:black; font-weight:bold; } -.account__avatar, -.account__avatar-overlay-base, -.account__header__avatar, +.account__avatar, +.account__avatar-overlay-base, +.account__header__avatar, .account__avatar-overlay-overlay { @include win95-border-slight-inset(); clip-path:none; @@ -670,7 +668,7 @@ body.admin { } .status-card__description { - color:black; + color:black; } .account__display-name strong, .status__display-name strong { @@ -717,7 +715,6 @@ body.admin { font-weight:bold; } - .drawer__header { background: $win95-bg; @include win95-border-outset() @@ -753,8 +750,8 @@ body.admin { width:40px; font-size:0px; color:$win95-bg; - - background-image: url("~images/start.png"); + + background-image: url("~images/start.png"); background-repeat:no-repeat; background-position:8%; background-clip:padding-box; @@ -766,7 +763,7 @@ body.admin { } .drawer__header a:first-child:hover { - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAF3pUWHRBdXRob3IAAAiZS84oys9LzAEAC5oC6A7BY/IAAACWSURBVCiRhVJJDsQgDEuqOfRZ7a1P5gbP4uaJaEjTADMWQhHYjlk4p0wLnNdptdF4KvBUDyGzVwc2xO+uKtH+1o0ytEEmqFpuxlvFCGCxKbNIT56QCi2MzaA/2Mz+mERSOeqzJG2RUxkjdTabgPtFoZ1bZxcKvgPcLZVufAyR9Ni8v5dWDzfFx0giC1RvZFv6l35QQ/Mvv39XXgGzQpoAAAAASUVORK5CYII="); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAF3pUWHRBdXRob3IAAAiZS84oys9LzAEAC5oC6A7BY/IAAACWSURBVCiRhVJJDsQgDEuqOfRZ7a1P5gbP4uaJaEjTADMWQhHYjlk4p0wLnNdptdF4KvBUDyGzVwc2xO+uKtH+1o0ytEEmqFpuxlvFCGCxKbNIT56QCi2MzaA/2Mz+mERSOeqzJG2RUxkjdTabgPtFoZ1bZxcKvgPcLZVufAyR9Ni8v5dWDzfFx0giC1RvZFv6l35QQ/Mvv39XXgGzQpoAAAAASUVORK5CYII="); background-repeat:no-repeat; background-position:8%; background-clip:padding-box; @@ -775,7 +772,7 @@ body.admin { } .drawer__tab:first-child { - + } .search { @@ -858,7 +855,7 @@ body.admin { font-weight:bold; } -.compose-form .autosuggest-textarea__textarea, +.compose-form .autosuggest-textarea__textarea, .compose-form .spoiler-input__input { border-radius:0px; @include win95-border-slight-inset(); @@ -905,7 +902,7 @@ body.admin { color: $win95-dark-grey; } -.privacy-dropdown.active +.privacy-dropdown.active .privacy-dropdown__value { background: $win95-bg; box-shadow:unset; @@ -1004,7 +1001,7 @@ body.admin { background-color:$win95-bg; border:1px solid black; box-sizing:content-box; - + } .emoji-dialog .emoji-search { @@ -1079,8 +1076,8 @@ body.admin { width:60px; font-size:0px; color:$win95-bg; - - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAF3pUWHRBdXRob3IAAAiZS84oys9LzAEAC5oC6A7BY/IAAACWSURBVCiRhVJJDsQgDEuqOfRZ7a1P5gbP4uaJaEjTADMWQhHYjlk4p0wLnNdptdF4KvBUDyGzVwc2xO+uKtH+1o0ytEEmqFpuxlvFCGCxKbNIT56QCi2MzaA/2Mz+mERSOeqzJG2RUxkjdTabgPtFoZ1bZxcKvgPcLZVufAyR9Ni8v5dWDzfFx0giC1RvZFv6l35QQ/Mvv39XXgGzQpoAAAAASUVORK5CYII="); + + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAF3pUWHRBdXRob3IAAAiZS84oys9LzAEAC5oC6A7BY/IAAACWSURBVCiRhVJJDsQgDEuqOfRZ7a1P5gbP4uaJaEjTADMWQhHYjlk4p0wLnNdptdF4KvBUDyGzVwc2xO+uKtH+1o0ytEEmqFpuxlvFCGCxKbNIT56QCi2MzaA/2Mz+mERSOeqzJG2RUxkjdTabgPtFoZ1bZxcKvgPcLZVufAyR9Ni8v5dWDzfFx0giC1RvZFv6l35QQ/Mvv39XXgGzQpoAAAAASUVORK5CYII="); background-repeat:no-repeat; background-position:8%; background-clip:padding-box; @@ -1130,52 +1127,52 @@ body.admin { } } -.column-link[href="/web/timelines/public"] { - background-image: url("~images/icon_public.png"); +.column-link[href="/web/timelines/public"] { + background-image: url("~images/icon_public.png"); &:hover { background-image: url("~images/icon_public.png"); } } -.column-link[href="/web/timelines/public/local"] { - background-image: url("~images/icon_local.png"); +.column-link[href="/web/timelines/public/local"] { + background-image: url("~images/icon_local.png"); &:hover { background-image: url("~images/icon_local.png"); } } -.column-link[href="/web/pinned"] { - background-image: url("~images/icon_pin.png"); +.column-link[href="/web/pinned"] { + background-image: url("~images/icon_pin.png"); &:hover { background-image: url("~images/icon_pin.png"); } } -.column-link[href="/web/favourites"] { - background-image: url("~images/icon_likes.png"); +.column-link[href="/web/favourites"] { + background-image: url("~images/icon_likes.png"); &:hover { background-image: url("~images/icon_likes.png"); } } -.column-link[href="/web/lists"] { - background-image: url("~images/icon_lists.png"); +.column-link[href="/web/lists"] { + background-image: url("~images/icon_lists.png"); &:hover { background-image: url("~images/icon_lists.png"); } } -.column-link[href="/web/follow_requests"] { - background-image: url("~images/icon_follow_requests.png"); +.column-link[href="/web/follow_requests"] { + background-image: url("~images/icon_follow_requests.png"); &:hover { background-image: url("~images/icon_follow_requests.png"); } } -.column-link[href="/web/keyboard-shortcuts"] { - background-image: url("~images/icon_keyboard_shortcuts.png"); +.column-link[href="/web/keyboard-shortcuts"] { + background-image: url("~images/icon_keyboard_shortcuts.png"); &:hover { background-image: url("~images/icon_keyboard_shortcuts.png"); } } -.column-link[href="/web/blocks"] { - background-image: url("~images/icon_blocks.png"); +.column-link[href="/web/blocks"] { + background-image: url("~images/icon_blocks.png"); &:hover { background-image: url("~images/icon_blocks.png"); } } -.column-link[href="/web/mutes"] { - background-image: url("~images/icon_mutes.png"); +.column-link[href="/web/mutes"] { + background-image: url("~images/icon_mutes.png"); &:hover { background-image: url("~images/icon_mutes.png"); } } -.column-link[href="/settings/preferences"] { - background-image: url("~images/icon_settings.png"); +.column-link[href="/settings/preferences"] { + background-image: url("~images/icon_settings.png"); &:hover { background-image: url("~images/icon_settings.png"); } } -.column-link[href="/about/more"] { - background-image: url("~images/icon_about.png"); +.column-link[href="/about/more"] { + background-image: url("~images/icon_about.png"); &:hover { background-image: url("~images/icon_about.png"); } } -.column-link[href="/auth/sign_out"] { - background-image: url("~images/icon_logout.png"); +.column-link[href="/auth/sign_out"] { + background-image: url("~images/icon_logout.png"); &:hover { background-image: url("~images/icon_logout.png"); } } @@ -1191,7 +1188,7 @@ body.admin { line-height:30px; padding-left:20px; padding-right:40px; - + left:0px; bottom:-30px; display:block; @@ -1199,9 +1196,9 @@ body.admin { background-color:#7f7f7f; width:200%; height:30px; - + -ms-transform: rotate(-90deg); - + -webkit-transform: rotate(-90deg); transform: rotate(-90deg); transform-origin:top left; @@ -1307,7 +1304,7 @@ body.admin { left:unset; } -.dropdown > .icon-button, .detailed-status__button > .icon-button, +.dropdown > .icon-button, .detailed-status__button > .icon-button, .status__action-bar > .icon-button, .star-icon i { /* i don't know what's going on with the inline styles someone should look at the react code */ @@ -1357,8 +1354,8 @@ body.admin { background:$win95-bg; } -.actions-modal::before, -.boost-modal::before, +.actions-modal::before, +.boost-modal::before, .confirmation-modal::before, .report-modal::before { content: "Confirmation"; @@ -1396,8 +1393,8 @@ body.admin { .confirmation-modal__cancel-button { color:black; - &:active, - &:focus, + &:active, + &:focus, &:hover { color:black; } @@ -1420,7 +1417,6 @@ body.admin { background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAFnpUWHRUaXRsZQAACJnLzU9JzElKBwALgwLXaCRlPwAAABd6VFh0QXV0aG9yAAAImUvOKMrPS8wBAAuaAugOwWPyAAAAEUlEQVQImWNgYGD4z4AE/gMADwMB/414xEUAAAAASUVORK5CYII='); } - .admin-wrapper::before { position:absolute; top:0px; @@ -1684,10 +1680,10 @@ a.table-action-link:hover, background-color:white; } -.simple_form input[type=text], -.simple_form input[type=number], -.simple_form input[type=email], -.simple_form input[type=password], +.simple_form input[type=text], +.simple_form input[type=number], +.simple_form input[type=email], +.simple_form input[type=password], .simple_form textarea { color:black; background-color:white; @@ -1698,8 +1694,8 @@ a.table-action-link:hover, } } -.simple_form button, -.simple_form .button, +.simple_form button, +.simple_form .button, .simple_form .block-button { background: $win95-bg; @@ -1726,8 +1722,8 @@ a.table-action-link:hover, } } -.simple_form button.negative, -.simple_form .button.negative, +.simple_form button.negative, +.simple_form .button.negative, .simple_form .block-button.negative { background: $win95-bg; @@ -1749,8 +1745,8 @@ a.table-action-link:hover, border-right-color:#f5f5f5; width:12px; height:12px; - display:inline-block; - vertical-align:middle; + display:inline-block; + vertical-align:middle; margin-right:2px; } @@ -1765,4 +1761,3 @@ a.table-action-link:hover, color:black; border-bottom: 0px solid transparent; } -