Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
Conflicts: app/javascript/styles/win95.scss config/themes.yml
This commit is contained in:
commit
d3f64812a6
Binary file not shown.
After Width: | Height: | Size: 378 B |
Binary file not shown.
After Width: | Height: | Size: 8.7 KiB |
Binary file not shown.
After Width: | Height: | Size: 561 B |
Binary file not shown.
After Width: | Height: | Size: 384 B |
Binary file not shown.
After Width: | Height: | Size: 437 B |
|
@ -189,10 +189,31 @@ body.admin {
|
||||||
.drawer .drawer__inner {
|
.drawer .drawer__inner {
|
||||||
overflow: visible;
|
overflow: visible;
|
||||||
height:inherit;
|
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;
|
||||||
|
z-index:0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.drawer__pager {
|
.drawer__pager {
|
||||||
overflow-y:auto;
|
overflow-y:auto;
|
||||||
|
z-index:1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.privacy-dropdown__dropdown {
|
||||||
|
z-index:2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.column {
|
.column {
|
||||||
|
@ -219,6 +240,7 @@ body.admin {
|
||||||
border-bottom-width:0px;
|
border-bottom-width:0px;
|
||||||
color:white;
|
color:white;
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
|
align-items:baseline;
|
||||||
}
|
}
|
||||||
|
|
||||||
.column-header__wrapper.active {
|
.column-header__wrapper.active {
|
||||||
|
@ -237,6 +259,11 @@ body.admin {
|
||||||
color:white;
|
color:white;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.column-header__buttons {
|
||||||
|
max-height: 20px;
|
||||||
|
margin-right:0px;
|
||||||
|
}
|
||||||
|
|
||||||
.column-header__button {
|
.column-header__button {
|
||||||
background: $win95-bg;
|
background: $win95-bg;
|
||||||
color: black;
|
color: black;
|
||||||
|
@ -246,6 +273,10 @@ body.admin {
|
||||||
padding:0px 2px;
|
padding:0px 2px;
|
||||||
margin-top:2px;
|
margin-top:2px;
|
||||||
@include win95-outset()
|
@include win95-outset()
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.column-header__button.active, .column-header__button.active:hover {
|
.column-header__button.active, .column-header__button.active:hover {
|
||||||
|
@ -308,6 +339,13 @@ body.admin {
|
||||||
padding:4px;
|
padding:4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.column-inline-form {
|
||||||
|
background-color: $win95-bg;
|
||||||
|
@include win95-border-outset();
|
||||||
|
border-bottom-width:0px;
|
||||||
|
border-top-width:0px;
|
||||||
|
}
|
||||||
|
|
||||||
.column-settings__section {
|
.column-settings__section {
|
||||||
color:black;
|
color:black;
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
|
@ -820,12 +858,13 @@ body.admin {
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
.autosuggest-textarea__textarea, .spoiler-input__input {
|
.compose-form .autosuggest-textarea__textarea,
|
||||||
|
.compose-form .spoiler-input__input {
|
||||||
border-radius:0px;
|
border-radius:0px;
|
||||||
@include win95-border-slight-inset();
|
@include win95-border-slight-inset();
|
||||||
}
|
}
|
||||||
|
|
||||||
.autosuggest-textarea__textarea {
|
.compose-form .autosuggest-textarea__textarea {
|
||||||
border-bottom:0px;
|
border-bottom:0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -840,13 +879,30 @@ body.admin {
|
||||||
border-right:1px inset $win95-bg;
|
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 {
|
.compose-form__buttons {
|
||||||
background-color:$win95-bg;
|
background-color:$win95-bg;
|
||||||
border-radius:0px;
|
border-radius:0px;
|
||||||
box-shadow:unset;
|
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
|
.privacy-dropdown.active
|
||||||
|
@ -860,7 +916,11 @@ body.admin {
|
||||||
background:$win95-window-header;
|
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;
|
box-shadow:unset;
|
||||||
color:black;
|
color:black;
|
||||||
@include win95-outset()
|
@include win95-outset()
|
||||||
|
@ -934,6 +994,10 @@ body.admin {
|
||||||
display:none;
|
display:none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.emoji-picker-dropdown__menu {
|
||||||
|
z-index:2;
|
||||||
|
}
|
||||||
|
|
||||||
.emoji-dialog.with-search {
|
.emoji-dialog.with-search {
|
||||||
box-shadow:unset;
|
box-shadow:unset;
|
||||||
border-radius:0px;
|
border-radius:0px;
|
||||||
|
@ -1026,26 +1090,37 @@ body.admin {
|
||||||
.column-subheading {
|
.column-subheading {
|
||||||
background-color:$win95-bg;
|
background-color:$win95-bg;
|
||||||
color:black;
|
color:black;
|
||||||
font-size:0px;
|
|
||||||
border-bottom: 2px groove $win95-bg;
|
border-bottom: 2px groove $win95-bg;
|
||||||
padding:0px;
|
text-transform: none;
|
||||||
margin:0px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.column-link {
|
.column-link {
|
||||||
background-color:transparent;
|
background-color:transparent;
|
||||||
|
color:black;
|
||||||
|
&: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-size:32px 32px;
|
||||||
background-repeat:no-repeat;
|
background-repeat:no-repeat;
|
||||||
background-position: 36px 50%;
|
background-position: 36px 50%;
|
||||||
color:black;
|
|
||||||
padding-left:40px;
|
padding-left:40px;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: $win95-window-header;
|
|
||||||
background-size:32px 32px;
|
background-size:32px 32px;
|
||||||
background-repeat:no-repeat;
|
background-repeat:no-repeat;
|
||||||
background-position: 36px 50%;
|
background-position: 36px 50%;
|
||||||
color:white;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
i {
|
i {
|
||||||
|
@ -1053,6 +1128,7 @@ body.admin {
|
||||||
width:32px;
|
width:32px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.column-link[href="/web/timelines/public"] {
|
.column-link[href="/web/timelines/public"] {
|
||||||
background-image: url("~images/icon_public.png");
|
background-image: url("~images/icon_public.png");
|
||||||
|
@ -1070,6 +1146,18 @@ body.admin {
|
||||||
background-image: url("~images/icon_likes.png");
|
background-image: url("~images/icon_likes.png");
|
||||||
&:hover { 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"] {
|
.column-link[href="/web/blocks"] {
|
||||||
background-image: url("~images/icon_blocks.png");
|
background-image: url("~images/icon_blocks.png");
|
||||||
&:hover { background-image: url("~images/icon_blocks.png"); }
|
&:hover { background-image: url("~images/icon_blocks.png"); }
|
||||||
|
@ -1124,6 +1212,14 @@ body.admin {
|
||||||
background-color:$win95-bg;
|
background-color:$win95-bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.column .static-content.getting-started {
|
||||||
|
display:none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.keyboard-shortcuts kbd {
|
||||||
|
background-color: $win95-bg;
|
||||||
|
}
|
||||||
|
|
||||||
.account__header {
|
.account__header {
|
||||||
background-color:#7f7f7f;
|
background-color:#7f7f7f;
|
||||||
}
|
}
|
||||||
|
@ -1132,6 +1228,23 @@ body.admin {
|
||||||
color:white;
|
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 {
|
.account__action-bar__tab > span {
|
||||||
color:black;
|
color:black;
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
|
|
Loading…
Reference in New Issue