diff options
Diffstat (limited to 'theme')
| -rw-r--r-- | theme/admin/html/database.php | 2 | ||||
| -rw-r--r-- | theme/admin/html/page/item.php | 2 | ||||
| -rw-r--r-- | theme/admin/html/post/item.php | 2 | ||||
| -rw-r--r-- | theme/admin/html/user/delete.php | 2 | ||||
| -rw-r--r-- | theme/admin/html/user/item.php | 2 | ||||
| -rw-r--r-- | theme/admin/rsrc/css/import/_main.scss | 743 | ||||
| -rw-r--r-- | theme/admin/rsrc/css/import/_responsive.scss | 29 | ||||
| -rw-r--r-- | theme/admin/rsrc/css/import/_variables.scss | 31 | ||||
| -rw-r--r-- | theme/admin/rsrc/css/main.css | 131 | ||||
| -rw-r--r-- | theme/admin/rsrc/css/main.scss | 771 |
10 files changed, 896 insertions, 819 deletions
diff --git a/theme/admin/html/database.php b/theme/admin/html/database.php index da41e68..cdc9b31 100644 --- a/theme/admin/html/database.php +++ b/theme/admin/html/database.php @@ -21,7 +21,7 @@ <?php if($FORM['RESULT']): ?> <div class="form-border-box background padding"> - <pre id="database-result"><?=escapeHTML($FORM['RESULT'])?></pre> + <pre><?=escapeHTML($FORM['RESULT'])?></pre> </div> <?php endif; ?> diff --git a/theme/admin/html/page/item.php b/theme/admin/html/page/item.php index d0bf2d7..018286e 100644 --- a/theme/admin/html/page/item.php +++ b/theme/admin/html/page/item.php @@ -25,7 +25,7 @@ <?php if($PAGE['ARGV']): ?> <ul class="arguments"> <?php foreach($PAGE['ARGV'] as $argument => $value): ?> - <li><strong><?=$argument?>:</strong> <span><?=escapeHTML($value)?></span></li> + <li><strong><?=$argument?>:</strong> <code><?=escapeHTML($value)?></code></li> <?php endforeach; ?> </ul> <?php endif; ?> diff --git a/theme/admin/html/post/item.php b/theme/admin/html/post/item.php index 6fcbcad..5261bdb 100644 --- a/theme/admin/html/post/item.php +++ b/theme/admin/html/post/item.php @@ -31,7 +31,7 @@ <?php if($POST['ARGV']): ?> <ul class="arguments"> <?php foreach($POST['ARGV'] as $argument => $value): ?> - <li><strong><?=$argument?>:</strong> <span><?=escapeHTML($value)?></span></li> + <li><strong><?=$argument?>:</strong> <code><?=escapeHTML($value)?></code></li> <?php endforeach; ?> </ul> <?php endif; ?> diff --git a/theme/admin/html/user/delete.php b/theme/admin/html/user/delete.php index b500a12..16e11b5 100644 --- a/theme/admin/html/user/delete.php +++ b/theme/admin/html/user/delete.php @@ -2,7 +2,7 @@ <h1><i class="fa fa-trash-o"></i><?=$Language->text('delete_user')?></h1> <p><?=$Language->text('delete_user_desc')?></p> -<p class="red"><?=$Language->text('delete_user_warning')?></p> +<p class="warning"><?=$Language->text('delete_user_warning')?></p> <?=$HTML?> </main> diff --git a/theme/admin/html/user/item.php b/theme/admin/html/user/item.php index e65b033..9a5a83e 100644 --- a/theme/admin/html/user/item.php +++ b/theme/admin/html/user/item.php @@ -29,7 +29,7 @@ <?php if($USER['ARGV']): ?> <ul class="arguments"> <?php foreach($USER['ARGV'] as $argument => $value): ?> - <li><strong><?=$argument?>:</strong> <span><?=escapeHTML($value)?></span></li> + <li><strong><?=$argument?>:</strong> <code><?=escapeHTML($value)?></code></li> <?php endforeach; ?> </ul> <?php endif; ?> diff --git a/theme/admin/rsrc/css/import/_main.scss b/theme/admin/rsrc/css/import/_main.scss new file mode 100644 index 0000000..5e4a6fe --- /dev/null +++ b/theme/admin/rsrc/css/import/_main.scss @@ -0,0 +1,743 @@ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Import variables +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +@import "variables"; + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Selection +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +::selection { + background: #BBB; + color: #000; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Hyperlinks +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +a { + color: $linkColor; + text-decoration: none; + + &:focus { + background: $linkColorFocused; + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Headings +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +h1, h2, h3 { + margin-bottom: 0; + text-transform: uppercase; + + +p { + margin-top: 0; + } + + .fa { + margin-right: 0.25rem; + } +} + +h1 { + margin-top: 0; + font-size: $fontSizeH1; +} + +h2 { + font-size: $fontSizeH2; +} + +h3 { + font-size: $fontSizeH3; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Document +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +html, body { + margin: 0; + padding: 0; +} + +html { + font-size: 1.25rem; + color: $textColor; + background: $htmlBackgroundColor; + -webkit-hyphens: auto; + hyphens: auto; +} + +body { + font-family: $fontFamily; + font-size: $fontSize; + line-height: $lineHeight; + display: flex; + min-height: 100vh; + flex-direction: column; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Main content +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#main-content { + flex: 1; + width: 100%; + background: $backgroundColor; + box-sizing: border-box; + padding: 0.75rem; + // border definition in _responsive.scss + + &.wide { + max-width: $contentWidthWide; + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Width +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#main-content, .header-content { + max-width: $contentWidth; + margin: 0 auto; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Header +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#main-header { + font-size: $fontSizeSmall; +} + +#header { + &-text { + font-size: $fontSizeLarge; + text-transform: uppercase; + } + + &-desc { + line-height: 1rem; + } + &-text, &-desc { + text-shadow: 0 -1px #4E718F, 1px 0 #4E718F, 0 1px #4E718F, -1px 0 #4E718F; + color: $headerBarTextColor; + font-weight: bold; + } + + &-logo { + display: block; + max-height: 5rem; + float: left; + margin-right: 0.5rem; + } +} + +.header-line { + padding: 0.25rem 0.75rem; + overflow: hidden; + background: $backgroundColorEmphasize; + + +.header-line { + border: 0.05rem solid $borderColor; + border-left: none; + border-right: none; + } + + &.background { + background: #5E819F; + position: sticky; + top: 0; + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Footer +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#main-footer { + font-size: $fontSizeSmall; + background: $backgroundColorEmphasize; + border-top: 0.05rem solid $borderColor; + padding: 0.5rem 0.75rem; + text-align: center; + + ul { + margin: 0; + padding: 0; + list-style: none; + + li { + display: inline; + + .fa { + margin-right: 0.125rem; + } + } + + li:after { + content: " – "; + font-weight: bold; + } + + li:last-child:after { + content: none; + } + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Main Navigation +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#main-navi { + ul { + list-style: none; + margin: 0; + padding: 0; + + li { + display: inline; + + .fa { + margin-right: 0.25rem; + } + } + + li:last-child { + float: right; + } + + li:first-child { + float: none; + } + } + + a { + padding: 0.1rem 0.3rem; + background: $navigationLinkBackgroundColor; + border: 0.05rem solid $borderColor; + color: inherit; + text-decoration: none; + text-align: center; + display: inline-block; + + &:hover, &:focus { + text-decoration: none; + background: $navigationLinkFocusedBackgroundColor; + } + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Site Navigation +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#site-navi { + clear: both; + display: flex; + box-sizing: border-box; + justify-content: space-between; + margin-top: 0.75rem; + + > div { + display: flex; + align-items: center; + border: 0.05rem solid $borderColor; + background: $backgroundColorEmphasize; + + > a { + display: block; + } + } + + .disabled { + pointer-events: none; + color: $borderColor; + } + + ol { + list-style: none; + margin: 0; + padding: 0; + + li { + float: left; + display: inline-block; + + + li { + border-left: 0.05rem solid $borderColor; + } + + &.active a { + background: $paginationActiveBackgroundColor; + font-weight: 600; + pointer-events: none; + } + } + } + + a { + padding: 0 0.5rem; + text-decoration: none; + color: inherit; + display: inline-block; + + &:hover, &:focus { + background: $navigationLinkFocusedBackgroundColor; + } + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Actions +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +.actions { + margin: 0 0 0.5rem 0; + padding: 0; + list-style: none; + font-size: $fontSizeSmall; + float: right; + text-align: center; + + .fa { + margin-right: 0.1rem; + } + + li { + display: inline-block; + font-weight: bold; + background: $backgroundColorEmphasize; + border: 0.05rem solid $borderColor; + } + + a { + color: inherit; + display: block; + padding: 0 0.25rem; + } +} + +.actions-before { + float: left; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Elements +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +pre { + margin-bottom: 1rem; + overflow: auto; + -moz-tab-size: 4; + tab-size: 4; + background: $backgroundColorEmphasize; + padding: 0.5rem; + border: 0.05rem solid $borderColor; +} + +code, pre { + font-family: $fontFamilyMonospaced; +} + +code { + color: $codeTextColor; +} + +p { + margin-top: 0; +} + +img { + border: none; + max-width: 100%; +} + +.warning { + color: $warningTextColor; +} + +.hidden { + display: none; +} + +.no-visual-list { + margin: 0; + padding: 0; + list-style: none; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Item Element +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +.item { + display: flex; + flex-direction: column; + border: 0.05rem solid $borderColor; + margin-bottom: 0.75rem; + clear: both; + + header { + padding: 0.5rem 0.75rem; + border-bottom: 0.05rem solid $borderColor; + position: sticky; + top: 0; + + h2 { + margin-top: 0; + } + } + + footer { + border-top: 0.05rem solid $borderColor; + + ul { + margin: 0; + padding: 0; + list-style: none; + + li { + display: inline-block; + float: left; + + &:last-child { + float: right; + } + } + } + + a { + color: inherit; + display: inline-block; + padding: 0.25rem 2rem; + + &:hover, &:active { + background: $itemLinkHoverBackgroundColor; + } + } + } + + header, footer { + background: $backgroundColorEmphasize; + overflow: hidden; + } + + blockquote { + margin: 0; + padding: 0.75rem; + overflow: hidden; + font-family: inherit; + flex-grow: 1; + + p { + margin-bottom: 0; + } + } + + &-id { + float: right; + color: $textColorLight; + font-size: 0.7rem; + font-weight: normal; + } + + &-meta { + margin: 0; + padding: 0; + list-style: none; + + &-right { + float: right; + } + + li { + display: inline-block; + + +li:before { + content: " – "; + } + + &.item-meta-right:before { + content: none; + } + } + } + + &-image { + float: left; + display: block; + margin-right: 0.75rem; + width: 10rem; + height: 7rem; + object-fit: cover; + background: $backgroundColorEmphasize; + border: 0.05rem solid $borderColor; + } + + &-container.grid { + width: 100%; + display: grid; + grid-template-columns: auto auto auto; + grid-column-gap: 1rem; + grid-row-gap: 1rem; + column-gap: 1rem; + row-gap: 1rem; + + .item { + margin-bottom: 0; + } + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Argument list +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +.arguments { + list-style: none; + margin: 0; + padding: 0.25rem 0.75rem; + background: $backgroundColorEmphasize; + font-size: $fontSizeSmall; + text-align: center; + border-top: 0.05rem solid $borderColor; + + li { + display: inline; + + > code { + font-family: inherit; + color: $textColorLight; + } + + &:after { + content: " · "; + font-weight: bold; + } + + &:last-child:after { + content: none; + } + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Grids +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +.form-grid { + display: grid; + grid-template-columns: 8rem auto 8rem auto; + + border-left: 0.05rem solid $borderColor; + border-bottom: 0.05rem solid $borderColor; + + &.two-columns { + grid-template-columns: auto auto; + } + + &.no-bottom-border { + border-bottom: none; + } + + > label { + display: flex; + align-items: center; + background: $formBackgroundColorEmphasize; + + .fa { + margin-left: 0.5rem; + margin-right: 1rem; + } + } + + &-item, + > label { + padding: 0.5rem; + border-top: 0.05rem solid $borderColor; + border-right: 0.05rem solid $borderColor; + } + + &-item.first { + grid-column-start: 2; + grid-column-end: 5; + } +} + +.form-border-box { + border: 0.05rem solid $borderColor; + + &.padding { + padding: 0.5rem; + } + + &.background { + background: $formBackgroundColorEmphasize; + } + + &.nobordertop { + border-top: none; + } + + +.form-border-box { + border-top: none; + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Form buttons +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#emoticon-list-wrapper { + display: flex; + width: 100%; + justify-content: center; + box-sizing: border-box; +} + +#button-list-wrapper { + border-bottom: 0.05rem solid $borderColor; + background: $backgroundColorEmphasize; + overflow: hidden; +} + +.button-list { + margin: 0; + padding: 0; + list-style: none; +} + +.button-list.emoticons > li { + font-size: 1.25rem; + display: inline-block; + padding: 0.2rem; + border-bottom: 0.2rem solid transparent; + border-radius: 0.1rem; + cursor: pointer; + + &:hover, &:active { + border-bottom: 0.2rem solid $borderColor; + } +} + +.button-list.markdown > li { + float: left; + padding: 0.25rem; + cursor: pointer; + width: 1.75rem; + box-sizing: border-box; + text-align: center; + + &:hover, &:active { + color: $textColorStrong; + } +} + +#content-editor { + border: none; + margin: 0; + + &-wrapper { + border-top: none; + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Form elements +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +input, select, textarea { + width: 100%; + background: $backgroundColorEmphasize; + color: $formElementTextColor; + font-family: inherit; + font-size: 0.7rem; + padding: 0.25rem; + border: 0.05rem solid $borderColor; + box-sizing: border-box; + + &:focus { + outline: none; + } +} + +textarea { + font-family: $fontFamilyTextarea; + box-sizing: border-box; + display: block; + resize: vertical; + min-height: 15rem; + line-height: 1.2rem; + padding: 0.5rem; + -webkit-hyphens: none; + hyphens: none; +} + +input { + &[type="submit"] { + text-transform: uppercase; + border-radius: 0.1rem; + } +} + +label { + text-transform: uppercase; + font-weight: normal; + + &:after { + content: ":"; + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Form buttons +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#insert-button, #update-button, #delete-button { + color: $formButtonTextColor; + border: 0.05rem solid $formButtonBorderColor; +} + +#insert-button { + background: $insertButtonBackgroundColor; + + &:active, &:focus { + background: darken($insertButtonBackgroundColor, 10%) + } +} + +#update-button { + background: $updateButtonBackgroundColor; + + &:active, &:focus { + background: darken($updateButtonBackgroundColor, 10%) + } +} + +#delete-button { + background: $deleteButtonBackgroundColor; + + &:active, &:focus { + background: darken($deleteButtonBackgroundColor, 10%) + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Form message list +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#message-list { + margin: 0; + padding: 0.5rem; + list-style: none; + background: $messageListBackgroundColor; + color: $messageListTextColor; + font-size: $fontSizeSmall; + + &-wrapper { + margin-bottom: 0.5rem; + border: 0.1rem solid darken($messageListBackgroundColor, 10%); + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Search form +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +#search-form { + margin-bottom: 1rem; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Import other files +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +@import "responsive"; +@import "fontello"; +@import "fonts"; diff --git a/theme/admin/rsrc/css/import/_responsive.scss b/theme/admin/rsrc/css/import/_responsive.scss index 2a7cebb..f6e0b5a 100644 --- a/theme/admin/rsrc/css/import/_responsive.scss +++ b/theme/admin/rsrc/css/import/_responsive.scss @@ -6,7 +6,7 @@ @media only screen and (min-width: 62.5em /*1000px*/) { #main-content { - border: 0.05rem solid #AAA; + border: 0.05rem solid $borderColor; border-top: none; border-bottom: none; } @@ -32,13 +32,15 @@ #main-navi { font-size: 1rem; - li { - span { - display: none; - } + ul { + li { + span { + display: none; + } - .fa { - margin-right: 0; + .fa { + margin-right: 0; + } } } @@ -76,6 +78,10 @@ overflow: hidden; box-sizing: border-box; + &-before { + float: none; + } + li { flex-grow: 1; @@ -84,13 +90,4 @@ } } } - - .actions-before { - float: none; - } - - .arguments { - font-size: 0.5rem; - line-height: 0.75rem; - } } diff --git a/theme/admin/rsrc/css/import/_variables.scss b/theme/admin/rsrc/css/import/_variables.scss new file mode 100644 index 0000000..70a8424 --- /dev/null +++ b/theme/admin/rsrc/css/import/_variables.scss @@ -0,0 +1,31 @@ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Line height +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +$lineHeight: 1.2rem; + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Font families +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +$fontFamily: "Ruda", "sans-serif"; +$fontFamilyTextarea: "Kadwa", "sans-serif"; +$fontFamilyMonospaced: "monospace"; + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Text font sizes +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +$fontSize: 0.7rem; +$fontSizeSmall: $fontSize - 0.1rem; +$fontSizeLarge: $fontSize + 0.1rem; + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Heading font sizes +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +$fontSizeH1: 0.80rem; +$fontSizeH2: 0.70rem; +$fontSizeH3: 0.65rem; + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Content widths +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +$contentWidth: 50rem; +$contentWidthWide: 90rem; diff --git a/theme/admin/rsrc/css/main.css b/theme/admin/rsrc/css/main.css index 2abfeac..866a7a0 100644 --- a/theme/admin/rsrc/css/main.css +++ b/theme/admin/rsrc/css/main.css @@ -1,8 +1,50 @@ @charset "UTF-8"; /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Content background and border color +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Header and navigation +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Text colors +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Misc +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Forms +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Form buttons +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Information message box +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Import stylesheet +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Import variables +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Line height +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Font families +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Text font sizes +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Heading font sizes +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Content widths +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # Selection ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -::-moz-selection { +::selection { background: #BBB; color: #000; } @@ -99,22 +141,18 @@ body { font-size: 0.6rem; } -#header-text, #header-desc { - text-shadow: 0 -1px #4E718F, 1px 0 #4E718F, 0 1px #4E718F, -1px 0 #4E718F; -} - #header-text { font-size: 0.8rem; - font-weight: 700; text-transform: uppercase; } - #header-desc { - font-size: 0.6rem; - font-weight: 700; line-height: 1rem; } - +#header-text, #header-desc { + text-shadow: 0 -1px #4E718F, 1px 0 #4E718F, 0 1px #4E718F, -1px 0 #4E718F; + color: #333; + font-weight: bold; +} #header-logo { display: block; max-height: 5rem; @@ -123,10 +161,9 @@ body { } .header-line { - padding: 0.5rem 0.75rem; + padding: 0.25rem 0.75rem; overflow: hidden; background: #EEE; - padding: 0.25rem 0.75rem; } .header-line + .header-line { border: 0.05rem solid #AAA; @@ -161,7 +198,7 @@ body { margin-right: 0.125rem; } #main-footer ul li:after { - content: " · "; + content: " – "; font-weight: bold; } #main-footer ul li:last-child:after { @@ -225,11 +262,6 @@ body { pointer-events: none; color: #AAA; } -#site-navi .active a { - background: #CCC !important; - font-weight: 600; - pointer-events: none; -} #site-navi ol { list-style: none; margin: 0; @@ -242,6 +274,11 @@ body { #site-navi ol li + li { border-left: 0.05rem solid #AAA; } +#site-navi ol li.active a { + background: #CCC; + font-weight: 600; + pointer-events: none; +} #site-navi a { padding: 0 0.5rem; text-decoration: none; @@ -293,7 +330,6 @@ pre { background: #EEE; padding: 0.5rem; border: 0.05rem solid #AAA; - font-style: italic; } code, pre { @@ -313,22 +349,10 @@ img { max-width: 100%; } -.red { +.warning { color: #B03060; } -.blue { - color: #40779A; -} - -.green { - color: #008B45; -} - -.right { - float: right; -} - .hidden { display: none; } @@ -339,10 +363,6 @@ img { list-style: none; } -#database-result { - color: inherit; -} - /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # Item Element ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ @@ -413,15 +433,15 @@ img { .item-meta-right { float: right; } -.item-meta-right:before { - content: none !important; -} .item-meta li { display: inline-block; } .item-meta li + li:before { content: " – "; } +.item-meta li.item-meta-right:before { + content: none; +} .item-image { float: left; display: block; @@ -460,8 +480,9 @@ img { .arguments li { display: inline; } -.arguments li > span { - color: #40779A; +.arguments li > code { + font-family: inherit; + color: #666; } .arguments li:after { content: " · "; @@ -565,7 +586,7 @@ img { text-align: center; } .button-list.markdown > li:hover, .button-list.markdown > li:active { - color: #40779A; + color: #000; } #content-editor { @@ -609,13 +630,6 @@ input[type=submit] { text-transform: uppercase; border-radius: 0.1rem; } -input:disabled { - background: #DDD; - color: #888; -} -input:disabled:hover { - cursor: not-allowed; -} label { text-transform: uppercase; @@ -677,6 +691,9 @@ label:after { margin-bottom: 1rem; } +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# Import other files +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ @media only screen and (max-width: 90em) { .item-container.grid { grid-template-columns: auto auto; @@ -708,10 +725,10 @@ label:after { #main-navi { font-size: 1rem; } - #main-navi li span { + #main-navi ul li span { display: none; } - #main-navi li .fa { + #main-navi ul li .fa { margin-right: 0; } #main-navi a { @@ -746,21 +763,15 @@ label:after { overflow: hidden; box-sizing: border-box; } + .actions-before { + float: none; + } .actions li { flex-grow: 1; } .actions li + li { border-left: none; } - - .actions-before { - float: none; - } - - .arguments { - font-size: 0.5rem; - line-height: 0.75rem; - } } /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # Fontello diff --git a/theme/admin/rsrc/css/main.scss b/theme/admin/rsrc/css/main.scss index 680de79..40334c7 100644 --- a/theme/admin/rsrc/css/main.scss +++ b/theme/admin/rsrc/css/main.scss @@ -1,762 +1,57 @@ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Selection +# Content background and border color ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -::-moz-selection { - background: #BBB; - color: #000; -} +$htmlBackgroundColor: #DDD; +$backgroundColor: #FFF; +$backgroundColorEmphasize: #EEE; +$borderColor: #AAA; /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Hyperlinks +# Header and navigation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -a { - color: #0060A0; - text-decoration: none; - - &:focus { - background: #CCC; - } -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Headings -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -h1, h2, h3 { - margin-bottom: 0; - text-transform: uppercase; - - +p { - margin-top: 0; - } - - .fa { - margin-right: 0.25rem; - } -} - -h1 { - margin-top: 0; - font-size: 0.80rem; -} - -h2 { - font-size: 0.70rem; -} - -h3 { - font-size: 0.65rem; -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Document -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -html, body { - margin: 0; - padding: 0; -} - -html { - font-size: 1.25rem; - color: #333; - background: #DDD; - -webkit-hyphens: auto; - hyphens: auto; -} - -body { - font-family: "Ruda", "sans-serif"; - font-size: 0.7rem; - line-height: 1.2rem; - display: flex; - min-height: 100vh; - flex-direction: column; -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Main content -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#main-content { - flex: 1; - width: 100%; - background: #FFF; - box-sizing: border-box; - padding: 0.75rem; - // border definition in _responsive.scss - - &.wide { - max-width: 90rem; - } -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Width -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#main-content, .header-content { - max-width: 50rem; - margin: 0 auto; -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Header -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#main-header { - font-size: 0.6rem; -} - -#header-text, #header-desc { - text-shadow: 0 -1px #4E718F, 1px 0 #4E718F, 0 1px #4E718F, -1px 0 #4E718F; -} - -#header-text { - font-size: 0.8rem; - font-weight: 700; - text-transform: uppercase; -} - -#header-desc { - font-size: 0.6rem; - font-weight: 700; - line-height: 1rem; -} - -#header-logo { - display: block; - max-height: 5rem; - float: left; - margin-right: 0.5rem; -} - -.header-line { - padding: 0.5rem 0.75rem; - overflow: hidden; - background: #EEE; - - padding: 0.25rem 0.75rem; - - +.header-line { - border: 0.05rem solid #AAA; - border-left: none; - border-right: none; - } - - &.background { - background: #5E819F; - position: sticky; - top: 0; - } -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Footer -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#main-footer { - font-size: 0.6rem; - background: #EEE; - border-top: 0.05rem solid #AAA; - padding: 0.5rem 0.75rem; - text-align: center; - - ul { - margin: 0; - padding: 0; - list-style: none; - - li { - display: inline; - - .fa { - margin-right: 0.125rem; - } - } - - li:after { - content: " · "; - font-weight: bold; - } - - li:last-child:after { - content: none; - } - } -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Main Navigation -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#main-navi { - ul { - list-style: none; - margin: 0; - padding: 0; - - li { - display: inline; - - .fa { - margin-right: 0.25rem; - } - } - - li:last-child { - float: right; - } - - li:first-child { - float: none; - } - } - - a { - padding: 0.1rem 0.3rem; - background: #DDD; - border: 0.05rem solid #AAA; - color: inherit; - text-decoration: none; - text-align: center; - display: inline-block; - - &:hover, &:focus { - text-decoration: none; - background: #CCC; - } - } -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Site Navigation -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#site-navi { - clear: both; - display: flex; - box-sizing: border-box; - justify-content: space-between; - margin-top: 0.75rem; - - > div { - display: flex; - align-items: center; - border: 0.05rem solid #AAA; - background: #EEE; - - > a { - display: block; - } - } - - .disabled { - pointer-events: none; - color: #AAA; - } - - .active a { - background: #CCC !important; - font-weight: 600; - pointer-events: none; - } - - ol { - list-style: none; - margin: 0; - padding: 0; - - li { - float: left; - display: inline-block; - - + li { - border-left: 0.05rem solid #AAA; - } - } - } - - a { - padding: 0 0.5rem; - text-decoration: none; - color: inherit; - display: inline-block; - - &:hover, &:focus { - background: #CCC; - } - } -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Actions -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.actions { - margin: 0 0 0.5rem 0; - padding: 0; - list-style: none; - font-size: 0.6rem; - float: right; - text-align: center; - - .fa { - margin-right: 0.1rem; - } - - li { - display: inline-block; - font-weight: bold; - background: #EEE; - border: 0.05rem solid #AAA; - } - - a { - color: inherit; - display: block; - padding: 0 0.25rem; - } -} - -.actions-before { - float: left; -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Elements -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -pre { - margin-bottom: 1rem; - overflow: auto; - -moz-tab-size: 4; - tab-size: 4; - background: #EEE; - padding: 0.5rem; - border: 0.05rem solid #AAA; - font-style: italic; -} - -code, pre { - font-family: "monospace"; -} - -code { - color: #008B45; -} - -p { - margin-top: 0; -} - -img { - border: none; - max-width: 100%; -} - -.red { - color: #B03060; -} - -.blue { - color: #40779A; -} - -.green { - color: #008B45; -} - -.right { - float: right; -} - -.hidden { - display: none; -} - -.no-visual-list { - margin: 0; - padding: 0; - list-style: none; -} - -#database-result { - color: inherit; -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Item Element -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.item { - display: flex; - flex-direction: column; - border: 0.05rem solid #AAA; - margin-bottom: 0.75rem; - clear: both; - - header { - padding: 0.5rem 0.75rem; - border-bottom: 0.05rem solid #AAA; - position: sticky; - top: 0; - - h2 { - margin-top: 0; - } - } - - footer { - border-top: 0.05rem solid #AAA; - - ul { - margin: 0; - padding: 0; - list-style: none; - - li { - display: inline-block; - float: left; - - &:last-child { - float: right; - } - } - } - - a { - color: inherit; - display: inline-block; - padding: 0.25rem 2rem; - - &:hover, &:active { - background: #DDD; - } - } - } - - header, footer { - background: #EEE; - overflow: hidden; - } - - blockquote { - margin: 0; - padding: 0.75rem; - overflow: hidden; - font-family: inherit; - flex-grow: 1; - - p { - margin-bottom: 0; - } - } - - &-id { - float: right; - color: #666; - font-size: 0.7rem; - font-weight: normal; - } - - &-meta { - margin: 0; - padding: 0; - list-style: none; - - &-right { - float: right; - - &:before { - content: none !important; - } - } - - li { - display: inline-block; - - +li:before { - content: " – "; - } - } - } - - &-image { - float: left; - display: block; - margin-right: 0.75rem; - width: 10rem; - height: 7rem; - object-fit: cover; - background: #EEE; - border: 0.05rem solid #AAA; - } - - &-container.grid { - width: 100%; - display: grid; - grid-template-columns: auto auto auto; - grid-column-gap: 1rem; - grid-row-gap: 1rem; - column-gap: 1rem; - row-gap: 1rem; - - .item { - margin-bottom: 0; - } - } -} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Argument list -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.arguments { - list-style: none; - margin: 0; - padding: 0.25rem 0.75rem; - background: #EEE; - font-size: 0.6rem; - text-align: center; - border-top: 0.05rem solid #AAA; - - li { - display: inline; - - > span { - color: #40779A; - } - - &:after { - content: " · "; - font-weight: bold; - } - - &:last-child:after { - content: none; - } - } -} +$headerBarTextColor: #333; +$navigationLinkBackgroundColor: #DDD; +$navigationLinkFocusedBackgroundColor: #CCC; /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Grids +# Text colors ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.form-grid { - display: grid; - grid-template-columns: 8rem auto 8rem auto; - - border-left: 0.05rem solid #AAA; - border-bottom: 0.05rem solid #AAA; - - &.two-columns { - grid-template-columns: auto auto; - } - - &.no-bottom-border { - border-bottom: none; - } - - > label { - display: flex; - align-items: center; - background: #DDD; - - .fa { - margin-left: 0.5rem; - margin-right: 1rem; - } - } - - &-item, - > label { - padding: 0.5rem; - border-top: 0.05rem solid #AAA; - border-right: 0.05rem solid #AAA; - } - - &-item.first { - grid-column-start: 2; - grid-column-end: 5; - } -} - -.form-border-box { - border: 0.05rem solid #AAA; - - &.padding { - padding: 0.5rem; - } - - &.background { - background: #DDD; - } - - &.nobordertop { - border-top: none; - } - - +.form-border-box { - border-top: none; - } -} +$textColor: #333; +$textColorLight: #666; +$textColorStrong: #000; +$formElementTextColor: #404040; +$codeTextColor: #008B45; +$linkColor: #0060A0; +$linkColorFocused: #CCC; +$warningTextColor: #B03060; /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Form buttons +# Misc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#emoticon-list-wrapper { - display: flex; - width: 100%; - justify-content: center; - box-sizing: border-box; -} - -#button-list-wrapper { - border-bottom: 0.05rem solid #AAA; - background: #EEE; - overflow: hidden; -} - -.button-list { - margin: 0; - padding: 0; - list-style: none; -} - -.button-list.emoticons > li { - font-size: 1.25rem; - display: inline-block; - padding: 0.2rem; - border-bottom: 0.2rem solid transparent; - border-radius: 0.1rem; - cursor: pointer; - - &:hover, &:active { - border-bottom: 0.2rem solid #AAA; - } -} - -.button-list.markdown > li { - float: left; - padding: 0.25rem; - cursor: pointer; - width: 1.75rem; - box-sizing: border-box; - text-align: center; - - &:hover, &:active { - color: #40779A; - } -} - -#content-editor { - border: none; - margin: 0; - - &-wrapper { - border-top: none; - } -} +$itemLinkHoverBackgroundColor: #DDD; +$paginationActiveBackgroundColor: #CCC; /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Form elements +# Forms ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -input, select, textarea { - width: 100%; - background: #EEE; - color: #404040; - font-family: inherit; - font-size: 0.7rem; - padding: 0.25rem; - border: 0.05rem solid #AAA; - box-sizing: border-box; - - &:focus { - outline: none; - } -} - -textarea { - font-family: "Kadwa", "sans-serif"; - box-sizing: border-box; - display: block; - resize: vertical; - min-height: 15rem; - line-height: 1.2rem; - padding: 0.5rem; - -webkit-hyphens: none; - hyphens: none; -} - -input { - &[type="submit"] { - text-transform: uppercase; - border-radius: 0.1rem; - } - - &:disabled { - background: #DDD; - color: #888; - - &:hover { - cursor: not-allowed; - } - } -} - -label { - text-transform: uppercase; - font-weight: normal; - - &:after { - content: ":"; - } -} +$formBackgroundColorEmphasize: #DDD; +$formButtonBorderColor: #404040; +$formButtonTextColor: #EEE; /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # Form buttons ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#insert-button, #update-button, #delete-button { - color: #EEE; - border: 0.05rem solid #404040; -} - -#insert-button { - background: #4D8D5D; - - &:active, &:focus { - background: darken(#4D8D5D, 10%) - } -} - -#update-button { - background: #6A8AA5; - - &:active, &:focus { - background: darken(#6A8AA5, 10%) - } -} - -#delete-button { - background: #C45C66; - - &:active, &:focus { - background: darken(#C45C66, 10%) - } -} +$insertButtonBackgroundColor: #4D8D5D; +$updateButtonBackgroundColor: #6A8AA5; +$deleteButtonBackgroundColor: #C45C66; /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Form message list +# Information message box ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#message-list { - margin: 0; - padding: 0.5rem; - list-style: none; - background: #C45C66; - color: #EEE; - font-size: 0.6rem; - - &-wrapper { - margin-bottom: 0.5rem; - border: 0.1rem solid darken(#C45C66, 10%); - } -} +$messageListTextColor: #EEE; +$messageListBackgroundColor: #C45C66; /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# Search form +# Import stylesheet ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#search-form { - margin-bottom: 1rem; -} - -@import "import/responsive"; -@import "import/fontello"; -@import "import/fonts"; +@import "import/main"; |