From 46001c0137c15da3a0ac2a48102c29857dd56342 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 18 Dec 2017 22:49:54 -0800 Subject: [PATCH] Win95 to 2.1 --- .../images/icon_follow_requests.png | Bin 0 -> 561 bytes .../images/icon_keyboard_shortcuts.png | Bin 0 -> 384 bytes app/javascript/images/icon_lists.png | Bin 0 -> 437 bytes app/javascript/styles/win95.scss | 118 +++++++++++++++--- 4 files changed, 99 insertions(+), 19 deletions(-) create mode 100644 app/javascript/images/icon_follow_requests.png create mode 100644 app/javascript/images/icon_keyboard_shortcuts.png create mode 100644 app/javascript/images/icon_lists.png diff --git a/app/javascript/images/icon_follow_requests.png b/app/javascript/images/icon_follow_requests.png new file mode 100644 index 0000000000000000000000000000000000000000..4123e2a6909a3df379ecf07ce07757c0172e829f GIT binary patch literal 561 zcmV-10?z%3P)JY#-?KBMuEnS#BimI*-vA zYTVUtqRgh|6A}qW&XL%i5I`nUcuPcc-X2)g-R_V;Q7V6ol<$DiRDqE^LJ~Pzj>9A@ zby~mWH(Px{w{J~08nP+^Rk3V9(UX`?MD5EtOG+x6<(QF8<^k`YMn-$p6FW0JzLYq( zo)cVk>|6=bn`nvT4$P4d^?}x%5+XT#hla?dOxm00000NkvXXu0mjffZ*%% literal 0 HcmV?d00001 diff --git a/app/javascript/images/icon_keyboard_shortcuts.png b/app/javascript/images/icon_keyboard_shortcuts.png new file mode 100644 index 0000000000000000000000000000000000000000..d66f3939e104c29fb24ec3b3fd7b2a16973db51a GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6jZMY zi6{xlEXhe_VBnZ}+UMN)?(=?YeNOr7cy;QZJE5=Tsi&*Cjg6s3ob$1h6z^1^7IBak z$I_CF{34JZ?{gZb&U>F>WZ<5~^n&kT@+Y8@JDx6%ArXh)hBxvZ5#R~^nD~#U{@C=d z9bb|xZ%>?hPc>WVwa?3Y)prA4874BjJeezSY6{2V$EN=uebt)eP+827$Q5OB>&P~B zgH_zRv8=yzlAAvC*{@~fT9dTvy?9HoW-esov%)bZD$o2h}`6%NT ZAA4X@l4#_Nxj=t1c)I$ztaD0e0su>mnnC~o literal 0 HcmV?d00001 diff --git a/app/javascript/images/icon_lists.png b/app/javascript/images/icon_lists.png new file mode 100644 index 0000000000000000000000000000000000000000..3828946e81b86fbec8d19b2f4bbb3832f4414ee8 GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6qKwA zi6{xlEXhe_VBnZ}+UMN)?(-*g^fcKR#E!FA#D;2J04fp(DRL|=$;dAPsq#Ljaq7JH z8Ab-~SxhhZ4kmwMU|^K@ba4!cIQ({cAYZcrPg~-{xGLjQXP>0Vnr8Xvu1j$KmLM#| zzU*(t>Hg1sl1f(ZZ8urI=UMy1eqQs2j?Ni@4nEQDT_;ddj7vj1D@=UmdrYsA(=V$zWyJuuZS;>f9%% zcd)OzwDv~j299-8^RAdBuFhOi&Hh+GjX`<6V#IbEhjT4(=Q8C|AfiPYt-#SR~mu z_0i*3whRpIOcCDSlNV0mWA3KEh1pV>)XrQ@lf6u4ow;VK|83DO> d!?#@9cT>ms%MRtFgTT;a@O1TaS?83{1OOQWx0V0^ literal 0 HcmV?d00001 diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss index 885837b530..a83f1a450c 100644 --- a/app/javascript/styles/win95.scss +++ b/app/javascript/styles/win95.scss @@ -214,6 +214,7 @@ body.admin { border-bottom-width:0px; color:white; font-weight:bold; + align-items:baseline; } .column-header__wrapper.active { @@ -232,6 +233,11 @@ body.admin { color:white; } +.column-header__buttons { + max-height: 20px; + margin-right:0px; +} + .column-header__button { background: $win95-bg; color: black; @@ -241,6 +247,10 @@ body.admin { padding:0px 2px; margin-top:2px; @include win95-outset() + + &:hover { + color: black; + } } .column-header__button.active, .column-header__button.active:hover { @@ -303,6 +313,13 @@ body.admin { padding:4px; } +.column-inline-form { + background-color: $win95-bg; + @include win95-border-outset(); + border-bottom-width:0px; + border-top-width:0px; +} + .column-settings__section { color:black; font-weight:bold; @@ -815,12 +832,13 @@ body.admin { font-weight:bold; } -.autosuggest-textarea__textarea, .spoiler-input__input { +.compose-form .autosuggest-textarea__textarea, +.compose-form .spoiler-input__input { border-radius:0px; @include win95-border-slight-inset(); } -.autosuggest-textarea__textarea { +.compose-form .autosuggest-textarea__textarea { border-bottom:0px; } @@ -835,13 +853,30 @@ body.admin { border-right:1px inset $win95-bg; } +.compose-form .compose-form__buttons-wrapper { + background-color: $win95-bg; + border:2px groove $win95-bg; + margin-top:4px; + padding:4px 8px; +} + .compose-form__buttons { background-color:$win95-bg; border-radius:0px; box-shadow:unset; - border:2px groove $win95-bg; - margin-top:4px; - padding:4px 8px; +} + +.compose-form__buttons-separator { + border-left: 2px groove $win95-bg; +} + +.privacy-dropdown.active .privacy-dropdown__value.active, +.advanced-options-dropdown.open .advanced-options-dropdown__value { + background: $win95-bg; +} + +.privacy-dropdown.active .privacy-dropdown__value.active .icon-button { + color: $win95-dark-grey; } .privacy-dropdown.active @@ -855,7 +890,11 @@ body.admin { background:$win95-window-header; } -.privacy-dropdown.active .privacy-dropdown__dropdown { +.privacy-dropdown__dropdown, +.privacy-dropdown.active .privacy-dropdown__dropdown, +.advanced-options-dropdown__dropdown, +.advanced-options-dropdown.open .advanced-options-dropdown__dropdown +{ box-shadow:unset; color:black; @include win95-outset() @@ -1021,31 +1060,43 @@ body.admin { .column-subheading { background-color:$win95-bg; color:black; - font-size:0px; border-bottom: 2px groove $win95-bg; - padding:0px; - margin:0px; + text-transform: none; + font-size: 16px; } .column-link { background-color:transparent; - background-size:32px 32px; - background-repeat:no-repeat; - background-position: 36px 50%; color:black; - padding-left:40px; - &:hover { background-color: $win95-window-header; + color:white; + } +} + +.getting-started__wrapper { + .column-subheading { + font-size:0px; + margin:0px; + padding:0px; + } + + .column-link { background-size:32px 32px; background-repeat:no-repeat; background-position: 36px 50%; - color:white; - } + padding-left:40px; - i { - font-size: 0px; - width:32px; + &:hover { + background-size:32px 32px; + background-repeat:no-repeat; + background-position: 36px 50%; + } + + i { + font-size: 0px; + width:32px; + } } } @@ -1065,6 +1116,18 @@ body.admin { 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"); + &:hover { background-image: url("../images/icon_lists.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"); + &:hover { background-image: url("../images/icon_keyboard_shortcuts.png"); } +} .column-link[href="/web/blocks"] { background-image: url("../images/icon_blocks.png"); &:hover { background-image: url("../images/icon_blocks.png"); } @@ -1127,6 +1190,23 @@ body.admin { color:white; } +.account-authorize__wrapper { + border: 2px groove $win95-bg; + margin: 2px; + padding:2px; +} + +.account--panel { + background-color: $win95-bg; + border:0px; + border-top: 2px groove $win95-bg; +} + +.account-authorize .account__header__content { + color:black; + margin:10px; +} + .account__action-bar__tab > span { color:black; font-weight:bold;