SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/336343 )
Change subject: Remve wordpress CSS and media file technical debt in DuskToDawn ...................................................................... Remve wordpress CSS and media file technical debt in DuskToDawn Bug: T157202 Change-Id: I11ff28ab9c59a69837ebec00e402caacbaea8294 --- D resources/images/ornaments-rs-ltr.png D resources/images/ornaments-rs-rtl.png D resources/images/page-rs-ltr.gif D resources/images/page-rs-rtl.gif M resources/style.css M skin.json 6 files changed, 20 insertions(+), 725 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DuskToDawn refs/changes/43/336343/1 diff --git a/resources/images/ornaments-rs-ltr.png b/resources/images/ornaments-rs-ltr.png deleted file mode 100644 index 1997819..0000000 --- a/resources/images/ornaments-rs-ltr.png +++ /dev/null Binary files differ diff --git a/resources/images/ornaments-rs-rtl.png b/resources/images/ornaments-rs-rtl.png deleted file mode 100644 index 7526bbb..0000000 --- a/resources/images/ornaments-rs-rtl.png +++ /dev/null Binary files differ diff --git a/resources/images/page-rs-ltr.gif b/resources/images/page-rs-ltr.gif deleted file mode 100644 index 704ecd5..0000000 --- a/resources/images/page-rs-ltr.gif +++ /dev/null Binary files differ diff --git a/resources/images/page-rs-rtl.gif b/resources/images/page-rs-rtl.gif deleted file mode 100644 index 3b91a1b..0000000 --- a/resources/images/page-rs-rtl.gif +++ /dev/null Binary files differ diff --git a/resources/style.css b/resources/style.css index 3115d4b..5954034 100644 --- a/resources/style.css +++ b/resources/style.css @@ -151,60 +151,13 @@ position: absolute; width: 100%; } -/* Right sidebar layout */ -.right-sidebar #page { - /* @embed */ - background: url(images/ornaments-rs-ltr.png) no-repeat 0 0; -} -.right-sidebar #main { - /* @embed */ - background: url(images/page-rs-ltr.gif) repeat-y 0 0; -} -.right-sidebar #primary { - float: left; - margin: 0 -282px 0 0; -} -.right-sidebar #content { - margin: 0 282px 0 0; -} -.right-sidebar #main .widget-area { - float: right; -} -/* Get rid of the faux column from templates without sidebars */ -.page-template-full-width-page-php #main, -.single-attachment #main, -.error404 #main { - background-color: #eeeae8; - background-image: none; -} -/* Increase the size of the content area for templates without sidebars */ -.full-width #content, -.image-attachment #content, -.error404 #content { - margin: 0; -} + /* Text meant only for screen readers */ .screen-reader-text, .assistive-text { position: absolute !important; clip: rect(1px, 1px, 1px, 1px); } -/* Alignment */ -.alignleft { - display: inline; - float: left; -} -.alignright { - display: inline; - float: right; -} -.aligncenter { - clear: both; - display: block; - margin-left: auto; - margin-right: auto; -} - /* Global */ @@ -437,9 +390,7 @@ padding: 8px 30px 6px; width: 474px; } -.right-sidebar #branding hgroup { - margin: 2px 0 54px 54px; -} + /* ashley change: originally #site-title */ #firstHeading { font: 300 25px/1.3 Ubuntu, sans-serif; @@ -461,17 +412,6 @@ /* Content */ - -.sticky { - background-color: #f6f6f6; -} -.sticky:first-child { - border-top-right-radius: 3px; -} -.right-sidebar .sticky:first-child { - border-top-right-radius: 0; - border-top-left-radius: 3px; -} .hentry { border-top: 1px solid #ccc; padding: 0 0 59px 0; @@ -488,27 +428,11 @@ margin: 0 0 47px 54px; padding: 0 30px 0 24px; } -.right-sidebar .entry-header { - border-left: none; - border-right: 6px solid #497ca7; - margin: 0 54px 47px 0; - padding: 0 24px 0 30px; -} -.page .entry-header, -.no-results .entry-header { + +.page .entry-header { padding: 68px 30px 0 24px; } -.error404 .entry-header, -.no-sidebar .full-width .entry-header, -.image-attachment .entry-header { - border-left: none; - border-right: none; - margin: 0 0 47px 0; - padding: 68px 30px 0 30px; -} -.image-attachment .entry-header { - padding: 0 30px 0 24px; -} + .entry-title { color: #0b0e18; font: 300 22px/22px Ubuntu, sans-serif; @@ -521,31 +445,11 @@ .entry-title a:hover { color: #497ca7; } -.entry-content, -.entry-summary { +.entry-content { padding: 0 30px 0 84px; width: 474px; } -.right-sidebar .entry-content, -.right-sidebar .entry-summary { - padding: 0 84px 0 30px; -} -.error404 .entry-content, -.full-width .entry-content, -.image-attachment .entry-content { - padding: 0 30px; - width: 810px; -} -.image-attachment .entry-content { - clear: both; - margin: 0 0 44px 0 -} -.image-attachment .entry-caption { - color: #777; - font-family: Georgia, serif; - font-style: italic; - margin: .5em 0 0 0; -} + .entry-header .entry-meta .sep { text-transform: none; } @@ -569,27 +473,19 @@ padding: 23px 30px 0 84px; width: 474px; } -.right-sidebar footer.entry-meta { - padding: 23px 84px 0 30px; -} -.image-attachment footer.entry-meta { - padding: 23px 30px 0; - width: 810px; -} + .featured-image { margin: -6px 0 44px 0; } .single-author .entry-meta .byline { display: none; } -.entry-content table, -.comment-body table { +.entry-content table { border-bottom: 1px solid #ccc; margin: 0 0 22px; width: 100%; } -.entry-content th, -.comment-body th { +.entry-content th { color: #666; font-size: 10px; font-weight: bold; @@ -598,13 +494,11 @@ padding: 0 0 6px 0; text-transform: uppercase; } -.entry-content td, -.comment-body td { +.entry-content td{ border-top: 1px solid #ccc; padding: 6px 10px 6px 0; } -#content nav, -body.attachment #content nav { +#content nav { display: block; float: right; font-size: 10px; @@ -614,29 +508,11 @@ text-align: right; text-transform: uppercase; } -.right-sidebar #content nav { - float: left; -} -#content .nav-previous a, -#content .nav-next a { - background-color: #0b0e18; - float: left; - padding: 3px 15px; - width: auto; -} -#content nav#comment-nav-below { - margin: 0 -30px 44px 0; -} -.right-sidebar #content nav#comment-nav-below { - margin: 0 0 44px -30px; -} + #content nav:last-child { border-bottom-right-radius: 3px; } -.right-sidebar #content nav:last-child { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 0; -} + .page-link { clear: both; margin: 22px 0 0; @@ -649,10 +525,7 @@ line-height: 22px; padding: 71px 30px 60px 84px; } -.right-sidebar .page-header { - line-height: 22px; - padding: 71px 84px 60px 30px; -} + .page-title { color: #0b0e18; font: 700 13px/22px Ubuntu, sans-serif; @@ -665,142 +538,11 @@ font-size: 12px; text-shadow: 1px 1px 0 #fff; } -.category-archive-meta p, -.tag_archive_meta p { - margin: 0; -} -.entry-attachment { - margin: 0 0 22px 0; -} -/* Author Info */ -#author-info { - background-color: #e5e4e9; - color: #777; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - font-size: 12px; - line-height: 22px; - margin: 59px 0 6px 0; - overflow: hidden; - padding: 27px 30px 38px 15px; -} -.right-sidebar #author-info { - padding: 27px 15px 38px 30px; -} -#author-avatar { - float: left; - margin-right: -78px; -} -.right-sidebar #author-avatar { - float: right; - margin-left: -78px; - margin-right: 12px; -} -#author-avatar img { - border-radius: 50%; -} -#author-description { - float: left; - margin-left: 69px; -} -.right-sidebar #author-description { - float: right; - margin-left: 0; - margin-right: 69px; -} -#author-description h2 { - color: #0b0e18; - font: 700 13px/22px Ubuntu, sans-serif; - margin: 0; - text-shadow: 1px 1px 0 rgba(255,255,255,1); - text-transform: uppercase; -} -/* Widgets on 404 Page */ -.error404 .widget { - color: #4a4a49; - float: left; - margin: 30px 0; - width: 33%; -} -.error404 .widget .widgettitle { - color: #0b0e18; - font: 700 13px/22px Ubuntu, sans-serif; - text-shadow: 1px 1px 0 #fff; - text-transform: uppercase; -} -.error404 .widget .widgettitle, -.error404 .widget ul { - margin-right: 13px; -} -.error404 .widget_tag_cloud { - clear: both; - float: none; - width: 100%; -} + /* Notices */ -.post .notice, -.error404 #searchform { +.post .notice { display: block; padding: 22px 0; -} - - -/* Post Formats */ - -.entry-format:after { - content: '\0020\2013'; -} -/* Aside and Quote Posts */ -.format-aside .entry-title, -.format-quote .entry-title { - font: 13px/22px Verdana, sans-serif; - color: #777; - margin-bottom: 22px; - word-wrap: normal; -} -.format-aside .entry-title a, -.format-quote .entry-title a { - color: #777; -} -.format-quote blockquote { - margin: 0; -} -/* Audio Posts */ -.player audio { - display: none; - margin-bottom: 22px; -} -html.dusktodawn-mp3 .player.mp3 audio, -html.dusktodawn-ogg .player.ogg audio, -html.dusktodawn-wav .player.wav audio { - display: block; -} -html.dusktodawn-mp3 .player.mp3 .audio-file-link, -html.dusktodawn-ogg .player.ogg .audio-file-link, -html.dusktodawn-wav .player.wav .audio-file-link { - display: none; -} -/* Gallery Posts */ -.format-gallery .gallery-thumb { - margin: -5px 0 44px -84px; -} -.right-sidebar .format-gallery .gallery-thumb { - margin: -5px 0 44px -30px; -} -/* Chat Posts */ -.format-chat .entry-content p { - margin: 0; -} -.format-chat .entry-content p:nth-child(odd) { - font-weight: bold; -} -.format-chat .entry-content p:last-child { - margin-bottom: 22px; -} -/* Link Format */ -.format-link .link a:after{ - content: "\2192"; - padding-left: 6px; } /* =Images @@ -820,48 +562,16 @@ * left alone. Use "size-auto" class to apply to * other images. */ -img.size-auto, -img.size-full, -img.size-large, -img.size-medium, -.entry-attachment img, .widget-area img, -.comment-body img, .entry-content p img, .entry-content dt img, -.post-format-content img, -.wp-caption img { +.post-format-content img { /* When images are too wide for containing element, force them to fit. */ max-width: 100%; /* Override height to match resized width for correct aspect ratio. */ height: auto; } -#ie8 img.size-large { - width: auto; -} -img.alignleft, -.wp-caption.alignleft { - margin-right: 15px; -} -img.alignright, -.wp-caption.alignright { - margin-left: 15px; -} -.wp-caption { - color: #777; - font-family: Georgia, serif; - font-style: italic; - max-width: 100%; - text-align: center; -} -.entry-content .wp-caption .wp-caption-text { - margin: 6px 0 22px; -} -.gallery-caption { -} -.wp-smiley { - margin: 0; -} + /* Make sure embeds and iframes fit their containers */ embed, iframe, @@ -869,218 +579,6 @@ max-width: 100%; } - -/* Comments */ - -#comments { - clear: both; - font-size: 12px; - line-height: 22px; - padding: 40px 30px 44px 84px; -} -.right-sidebar #comments { - padding: 40px 84px 44px 30px; -} -.full-width #comments, -.image-attachment #comments { - padding: 0 30px 44px; -} -.commentlist { - margin: 0; -} -.full-width .commentlist, -.image-attachment .commentlist { - margin: 0 0 0 46px; -} -#comments #comments-title { - color: #0b0e18; - font: 700 13px/22px Ubuntu, sans-serif; - text-shadow: 1px 1px 0 rgba(255,255,255,1); - text-transform: uppercase; -} -.commentlist li.comment, -.commentlist li.trackback, -.commentlist li.pingback { - list-style-type: none; - margin: 44px 0; -} -.comment, -.trackback, -.pingback { - position: relative; -} -.comment .comment-author cite, -.trackback .comment-author cite, -.pingback .comment-author cite { - font-style: normal; - font-weight: bold; -} -.comment .comment-meta, -.trackback .comment-meta, -.pingback .comment-meta { - font-size: 11px; - position: absolute; - right: 0; - top: 0; -} -.comment .comment-meta a, -.trackback .comment-meta a, -.pingback .comment-meta a { - color: #777; -} -.comment p, -.trackback p, -.pingback p { - margin-bottom: 22px; -} -.right-sidebar .comment img.avatar { - left: auto; - right: -47px; -} -.comment img.avatar, -.no-sidebar .comment img.avatar, -body.attachment .comment img.avatar { - border-radius: 50%; - position: absolute; - left: -45px; - right: auto; -} -.comment-author { - width: 60%; -} -#comments .bypostauthor > .comment-body { - background: #feffe0; - border-radius: 3px; - color: #000; - padding: 22px; - position: relative; -} -#comments .bypostauthor > .comment-body .comment-meta { - right: 22px; - top: 22px; -} -.comment .reply a, -.trackback .reply a, -.pingback .reply a { - background: #eee; - border: 1px solid #ddd; - border-radius: 3px; - color: #555; - font-size: 11px; - padding: 3px 8px; -} -.comment .reply a:hover, -.trackback .reply a:hover, -.pingback .reply a:hover { - background: #ddd; - border-color: #ccc; - text-decoration: none; -} -.commentlist .children { - margin: 0 0 0 30px; -} -#respond #reply-title { - color: #0b0e18; - font: 700 13px/22px Ubuntu, sans-serif; - margin: 0; - text-shadow: 1px 1px 0 rgba(255,255,255,1); - text-transform: uppercase; -} -.nopassword, -.nocomments, -#respond .comment-notes { - color: #777; - font-size: 11px; -} -#respond input[type=text] { - display: block; - width: 60%; -} -#respond textarea { - display: block; - width: 80%; -} -#respond label { - font-size: 11px; - text-transform: uppercase; -} -#respond .form-allowed-tags { - display: none; -} -#respond input[type=submit] { - font-size: 13px; -} -.required { - color: #cc0033; -} -ol .comment-body ul, -ol .comment-body ol { - margin: 0 0 22px 18px; -} -ol .comment-body ul ul, -ol .comment-body ol ol, -ol .comment-body ul ol, -ol .comment-body ol ul { - margin-bottom: 0; -} - - -/* Sidebar */ - -/* Menu */ -#access { - border-top: 1px solid #252832; - display: block; - font-size: 11px; - line-height: 22px; - margin: -5px 0 65px 0; -} -#access ul { - margin: 0; -} -#access li { - border-bottom: 1px solid #252832; - list-style: none; - position: relative; -} -#access li a { - display: block; - padding: 5px 17px; -} -#access li a:hover, -#access .current_page_item > a, -#access .current_page_ancestor > a, -#access .current-menu-item > a, -#access .current-menu-ancestor > a { - color: #ddd; - text-decoration: none; -} -#access ul ul { - background: #222; - background: rgba(0, 0, 0, 0.8); - - box-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; - display: none; - font-size: 1em; - left: 222px; - position: absolute; - top: 0; - width: 222px; - z-index: 99999; -} -.right-sidebar #access ul ul { - left: auto; - right: 222px; -} -#access ul ul li { - border: none; -} -#access ul li:hover { - background: #000; -} -#access ul li:hover > ul { - display: block; -} /* Widgets */ .widget { color: #ccc; @@ -1104,136 +602,8 @@ .widget-title a { color: #fff; } -/* Calendar Widget */ -.widget_calendar #wp-calendar { - text-align: center; - width: 100%; -} -.widget_calendar #wp-calendar caption, -.widget_calendar #wp-calendar td, -.widget_calendar #wp-calendar th { - text-align: center; -} -.widget_calendar #wp-calendar caption { - color: #fff; - font: 700 13px/1.2 Ubuntu, sans-serif; - padding: 0 0 10px 0; - text-align: left; - text-transform: uppercase; -} -.widget_calendar #wp-calendar th { - font-weight: bold; -} -.widget_calendar #wp-calendar tfoot #prev { - padding: 8px 0 0 0; - text-align: left; -} -.widget_calendar #wp-calendar tfoot #next { - padding: 8px 0 0 0; - text-align: right; -} -/* Authors Widget */ -.widget_authors ul { - margin: 0; -} -.widget_authors li { - background: none !important; - overflow: hidden; -} -.widget_authors { - padding: 0 !important; -} -.widget_authors ul ul li { - overflow: hidden; -} -.widget_authors img { - float: left; - margin-bottom: 12px !important; - padding-right: 10px; -} -/* Author Grid Widget */ -.widget_author_grid ul { - margin: 0; -} -/* Flickr Widget (WP.com) */ -.widget_flickr #flickr_badge_uber_wrapper a:hover, -.widget_flickr #flickr_badge_uber_wrapper a:link, -.widget_flickr #flickr_badge_uber_wrapper a:active, -.widget_flickr #flickr_badge_uber_wrapper a:visited { - color: #497ca7; -} -.widget_flickr #flickr_badge_uber_wrapper a:hover { - text-decoration: underline !important; -} -.widget_flickr #flickr_badge_wrapper { - background-color: transparent !important; - border: none !important; -} -.widget_flickr table { - margin: 0 !important; -} -.widget_flickr .flickr-size-thumbnail { - margin: 0 auto; -} -.widget_flickr .flickr-size-thumbnail br, -.widget_flickr .flickr-size-small br { - display: none; -} -.widget_flickr .flickr-size-thumbnail img { - display: block; - margin-bottom: 10px; -} -.widget_flickr .flickr-size-small img { - display: block; - margin-bottom: 10px; - max-width: 100%; -} - /* Cloud Widgets */ -.wp_widget_tag_cloud div, -.widget_tag_cloud div { - word-wrap: break-word; -} -/* Search Widget */ -.widget-area .widget_search { - overflow: hidden; -} -.widget-area .widget_search input { - float: left; -} -/* Recent Comments Widget */ -.widget_recent_comments .avatar { - max-width: none; -} -.widget_recent_comments td.recentcommentstexttop, -.widget_recent_comments td.recentcommentstextend { - line-height: 1.1em; - vertical-align: top; -} -/* RSS links Widget */ -.widget_rss_links p img { - margin-bottom: 0; - vertical-align: middle; -} -/* Image WIdget */ -.widget_image p { - margin: 0; -} -.widget_blog_subscription p, -.widget_gravatar p { - margin: 0; -} -.widget-area .widget-gravatar-profile h4 { - font-size: 1.0em; - font-weight: bold; - margin: 0; -} -.widget-area .widget-gravatar-profile .gravatar-profile-accounts li a, -.widget-area .widget-gravatar-profile .gravatar-profile-accounts li a:visited { - padding: 3px 0; -} /* Footer */ - #colophon { background-color: #0b0e18; font-size: 11px; @@ -1245,81 +615,6 @@ margin: 0 auto; text-align: center; /* ashley */ width: 810px; -} - - -/* WP.com */ - -#wpstats { - display: block; - margin: -50px auto 0; - position: relative; - z-index: 999; -} - - -/* Jetpack: Infinite Scroll */ -.infinite-scroll #content .infinite-wrap { - border-top: none; - padding-top: 0; -} -.infinite-scroll .infinite-wrap .hentry:first-child { - border-top: 1px solid #ccc; -} -/* Make it match the theme */ -.infinite-scroll #infinite-footer .container { - color: #4a4a49 -} -.infinite-scroll #infinite-footer .blog-info, -.infinite-scroll #infinite-footer .blog-info a { - color: #497ca7; -} -.infinite-scroll #infinite-footer .blog-credits a { - color: #497ca7; -} -.infinite-scroll #infinite-footer .blog-info a:hover, -.infinite-scroll #infinite-footer .blog-info a:focus, -.infinite-scroll #infinite-footer .blog-credits a:hover, -.infinite-scroll #infinite-footer .blog-credits a:focus { - color: #497ca7; -} -.infinite-scroll #infinite-footer .blog-credits { - color: #4a4a49 -} -.infinite-scroll .infinite-loader { - margin: 0 auto 34px; - width: 24px; -} -.infinite-scroll #infinite-handle { - margin: 0 0 40px; - text-align: right; -} -.infinite-scroll.right-sidebar #infinite-handle { - text-align: left; -} -.infinite-scroll #infinite-handle span { - background-color: #0b0e18; - border-color: #0b0e18; - border-radius: 0; - color: #497ca7; -} -.infinite-scroll #infinite-handle span:before { - color: #497ca7; -} -.infinite-scroll #infinite-handle span:hover, -.infinite-scroll #infinite-handle span:focus, -.infinite-scroll #infinite-handle span:hover:before, -.infinite-scroll #infinite-handle span:focus:before { - color: #497ca7; -} -/* Elements to hide */ -.infinite-scroll #nav-below, -.infinite-scroll.neverending #colophon { - display: none; -} -/* Restore the footer when IS is finished */ -.infinity-end.neverending #colophon { - display: block; } /** ashley's additions for MediaWiki */ diff --git a/skin.json b/skin.json index 1ff250d..1b24f72 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Dusk To Dawn", - "version": "1.3.2", + "version": "1.3.3", "author": [ "[http://automattic.com/ Automattic]", "Jack Phoenix" -- To view, visit https://gerrit.wikimedia.org/r/336343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I11ff28ab9c59a69837ebec00e402caacbaea8294 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DuskToDawn Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits