From ed574fbc09eecee8a3717287391bb954a173ec9e Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 26 Oct 2017 23:19:20 -0700 Subject: Theme: Windows 95 --- app/javascript/images/icon_about.png | Bin 0 -> 497 bytes app/javascript/images/icon_blocks.png | Bin 0 -> 356 bytes app/javascript/images/icon_home.png | Bin 0 -> 328 bytes app/javascript/images/icon_likes.png | Bin 0 -> 326 bytes app/javascript/images/icon_local.png | Bin 0 -> 599 bytes app/javascript/images/icon_logout.png | Bin 0 -> 383 bytes app/javascript/images/icon_mutes.png | Bin 0 -> 411 bytes app/javascript/images/icon_pin.png | Bin 0 -> 337 bytes app/javascript/images/icon_public.png | Bin 0 -> 688 bytes app/javascript/images/icon_settings.png | Bin 0 -> 639 bytes app/javascript/images/start.png | Bin 0 -> 263 bytes 11 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/javascript/images/icon_about.png create mode 100644 app/javascript/images/icon_blocks.png create mode 100644 app/javascript/images/icon_home.png create mode 100644 app/javascript/images/icon_likes.png create mode 100644 app/javascript/images/icon_local.png create mode 100644 app/javascript/images/icon_logout.png create mode 100644 app/javascript/images/icon_mutes.png create mode 100644 app/javascript/images/icon_pin.png create mode 100644 app/javascript/images/icon_public.png create mode 100644 app/javascript/images/icon_settings.png create mode 100644 app/javascript/images/start.png (limited to 'app/javascript/images') diff --git a/app/javascript/images/icon_about.png b/app/javascript/images/icon_about.png new file mode 100644 index 000000000..08b76dcd9 Binary files /dev/null and b/app/javascript/images/icon_about.png differ diff --git a/app/javascript/images/icon_blocks.png b/app/javascript/images/icon_blocks.png new file mode 100644 index 000000000..8b1490875 Binary files /dev/null and b/app/javascript/images/icon_blocks.png differ diff --git a/app/javascript/images/icon_home.png b/app/javascript/images/icon_home.png new file mode 100644 index 000000000..66ce779c0 Binary files /dev/null and b/app/javascript/images/icon_home.png differ diff --git a/app/javascript/images/icon_likes.png b/app/javascript/images/icon_likes.png new file mode 100644 index 000000000..17d7a9c59 Binary files /dev/null and b/app/javascript/images/icon_likes.png differ diff --git a/app/javascript/images/icon_local.png b/app/javascript/images/icon_local.png new file mode 100644 index 000000000..5f82df395 Binary files /dev/null and b/app/javascript/images/icon_local.png differ diff --git a/app/javascript/images/icon_logout.png b/app/javascript/images/icon_logout.png new file mode 100644 index 000000000..7ff806f58 Binary files /dev/null and b/app/javascript/images/icon_logout.png differ diff --git a/app/javascript/images/icon_mutes.png b/app/javascript/images/icon_mutes.png new file mode 100644 index 000000000..c2225e966 Binary files /dev/null and b/app/javascript/images/icon_mutes.png differ diff --git a/app/javascript/images/icon_pin.png b/app/javascript/images/icon_pin.png new file mode 100644 index 000000000..2329d8c54 Binary files /dev/null and b/app/javascript/images/icon_pin.png differ diff --git a/app/javascript/images/icon_public.png b/app/javascript/images/icon_public.png new file mode 100644 index 000000000..3c09460db Binary files /dev/null and b/app/javascript/images/icon_public.png differ diff --git a/app/javascript/images/icon_settings.png b/app/javascript/images/icon_settings.png new file mode 100644 index 000000000..07f5c4519 Binary files /dev/null and b/app/javascript/images/icon_settings.png differ diff --git a/app/javascript/images/start.png b/app/javascript/images/start.png new file mode 100644 index 000000000..7843455b6 Binary files /dev/null and b/app/javascript/images/start.png differ -- cgit From 077f2e600c07a7ce336040f4b52760b7ba387d76 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 18 Dec 2017 22:49:54 -0800 Subject: Win95 to 2.1 --- app/javascript/images/icon_follow_requests.png | Bin 0 -> 561 bytes app/javascript/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 (limited to 'app/javascript/images') diff --git a/app/javascript/images/icon_follow_requests.png b/app/javascript/images/icon_follow_requests.png new file mode 100644 index 000000000..4123e2a69 Binary files /dev/null and b/app/javascript/images/icon_follow_requests.png differ diff --git a/app/javascript/images/icon_keyboard_shortcuts.png b/app/javascript/images/icon_keyboard_shortcuts.png new file mode 100644 index 000000000..d66f3939e Binary files /dev/null and b/app/javascript/images/icon_keyboard_shortcuts.png differ diff --git a/app/javascript/images/icon_lists.png b/app/javascript/images/icon_lists.png new file mode 100644 index 000000000..3828946e8 Binary files /dev/null and b/app/javascript/images/icon_lists.png differ diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss index 885837b53..a83f1a450 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; -- cgit From 7a93acd803f3c0853d6beeb046eac7c1a597a827 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 6 Jan 2018 18:25:19 -0800 Subject: To 2.1.2 --- app/javascript/images/clippy_frame.png | Bin 0 -> 376 bytes app/javascript/images/clippy_wave.gif | Bin 0 -> 8897 bytes app/javascript/styles/win95.scss | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 app/javascript/images/clippy_frame.png create mode 100644 app/javascript/images/clippy_wave.gif (limited to 'app/javascript/images') diff --git a/app/javascript/images/clippy_frame.png b/app/javascript/images/clippy_frame.png new file mode 100644 index 000000000..6a3cb4a38 Binary files /dev/null and b/app/javascript/images/clippy_frame.png differ diff --git a/app/javascript/images/clippy_wave.gif b/app/javascript/images/clippy_wave.gif new file mode 100644 index 000000000..4d2e38a3d Binary files /dev/null and b/app/javascript/images/clippy_wave.gif differ diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss index a83f1a450..4865c85fd 100644 --- a/app/javascript/styles/win95.scss +++ b/app/javascript/styles/win95.scss @@ -184,6 +184,21 @@ body.admin { .drawer .drawer__inner { overflow: visible; height:inherit; + background:$win95-bg; +} + +.drawer:after { + display:block; + content: " "; + + position:absolute; + bottom:15px; + left:15px; + width:132px; + height:117px; + background-image:url("../images/clippy_wave.gif"), url("../images/clippy_frame.png"); + background-repeat:no-repeat; + background-position: 4px 20px, 0px 0px; } .drawer__pager { @@ -1182,6 +1197,10 @@ body.admin { background-color:$win95-bg; } +.column .static-content.getting-started { + display:none; +} + .account__header { background-color:#7f7f7f; } -- cgit From 56312df73ba33d7c31570f67b9e01d62199e45b7 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 6 Jan 2018 18:38:19 -0800 Subject: Z indexes and colors --- app/javascript/images/clippy_frame.png | Bin 376 -> 378 bytes app/javascript/styles/win95.scss | 6 ++++++ 2 files changed, 6 insertions(+) (limited to 'app/javascript/images') diff --git a/app/javascript/images/clippy_frame.png b/app/javascript/images/clippy_frame.png index 6a3cb4a38..7f2cd6a59 100644 Binary files a/app/javascript/images/clippy_frame.png and b/app/javascript/images/clippy_frame.png differ diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss index 4865c85fd..bb1fcbb89 100644 --- a/app/javascript/styles/win95.scss +++ b/app/javascript/styles/win95.scss @@ -199,10 +199,16 @@ body.admin { background-image:url("../images/clippy_wave.gif"), url("../images/clippy_frame.png"); background-repeat:no-repeat; background-position: 4px 20px, 0px 0px; + z-index:0; } .drawer__pager { overflow-y:auto; + z-index:1; +} + +.privacy-dropdown__dropdown { + z-index:2; } .column { -- cgit