This commit is contained in:
Andrew Williamson 2018-03-19 22:19:31 +08:00 коммит произвёл GitHub
Родитель 972a0b608b
Коммит 3faf451dca
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 1275 добавлений и 1359 удалений

Просмотреть файл

@ -81,6 +81,5 @@ ENV HISTCONTROL erasedups
ENV CLEANCSS_BIN /deps/node_modules/.bin/cleancss
ENV LESS_BIN /deps/node_modules/.bin/lessc
ENV STYLUS_BIN /deps/node_modules/.bin/stylus
ENV UGLIFY_BIN /deps/node_modules/.bin/uglifyjs
ENV ADDONS_LINTER_BIN /deps/node_modules/.bin/addons-linter

Просмотреть файл

@ -74,7 +74,6 @@ RUN ln -s /usr/bin/uwsgi /usr/sbin/uwsgi
RUN ln -s /usr/lib/python2.7/plat-*/_sysconfigdata_nd.py /usr/lib/python2.7/
RUN echo "from olympia.lib.settings_base import *\n\
STYLUS_BIN = 'node_modules/stylus/bin/stylus'\n\
LESS_BIN = 'node_modules/less/bin/lessc'\n\
CLEANCSS_BIN = 'node_modules/clean-css-cli/bin/cleancss'\n\
UGLIFY_BIN = 'node_modules/uglify-js/bin/uglifyjs'\n\

Просмотреть файл

@ -23,7 +23,6 @@
"jszip": "3.1.4",
"less": "3.0.1",
"source-map": "0.7.2",
"stylus": "0.54.5",
"raven-js": "3.23.3",
"timeago": "1.6.2",
"uglify-js": "3.3.16",

Просмотреть файл

@ -59,8 +59,7 @@ CELERY_TASK_ALWAYS_EAGER = False
ALLOW_SELF_REVIEWS = True
# Assuming you did `npm install` (and not `-g`) like you were supposed to, this
# will be the path to the `stylus` and `lessc` executables.
STYLUS_BIN = os.getenv('STYLUS_BIN', path('node_modules/stylus/bin/stylus'))
# will be the path to the `lessc` executable.
LESS_BIN = os.getenv('LESS_BIN', path('node_modules/less/bin/lessc'))
CLEANCSS_BIN = os.getenv(
'CLEANCSS_BIN',

Просмотреть файл

@ -77,11 +77,9 @@ def _get_compiled_css_url(item):
Compresses a preprocess file and returns its relative compressed URL.
:param item:
Name of the less/sass/stylus file to compress into css.
Name of the less file to compress into css.
"""
if ((item.endswith('.less') and
getattr(settings, 'LESS_PREPROCESS', False)) or
item.endswith(('.sass', '.scss', '.styl'))):
if item.endswith('.less') and getattr(settings, 'LESS_PREPROCESS', False):
compile_css(item)
return item + '.css'
return item
@ -147,13 +145,6 @@ def compile_css(item):
if item.endswith('.less'):
with open(path_dst, 'w') as output:
subprocess.Popen([settings.LESS_BIN, path_src], stdout=output)
elif item.endswith(('.sass', '.scss')):
with open(path_dst, 'w') as output:
subprocess.Popen([settings.SASS_BIN, path_src], stdout=output)
elif item.endswith('.styl'):
subprocess.call('%s --include-css --include %s < %s > %s' %
(settings.STYLUS_BIN, os.path.dirname(path_src),
path_src, path_dst), shell=True)
def build_ids(request):

Просмотреть файл

@ -69,9 +69,6 @@ LESS_PREPROCESS = True # Compile LESS with Node, rather than client-side JS?
LESS_LIVE_REFRESH = False # Refresh the CSS on save?
LESS_BIN = 'lessc'
# Path to stylus (to compile .styl files).
STYLUS_BIN = 'stylus'
# Path to cleancss (our CSS minifier).
CLEANCSS_BIN = 'cleancss'
@ -705,14 +702,14 @@ MINIFY_BUNDLES = {
'css/impala/devhub-api.less',
),
'zamboni/reviewers': (
'css/zamboni/reviewers.styl',
'css/zamboni/reviewers.less',
'css/zamboni/unlisted.less',
'css/zamboni/reviewers.less',
),
'zamboni/themes_review': (
'css/zamboni/developers.css',
'css/zamboni/reviewers.styl',
'css/zamboni/themes_review.styl',
'css/zamboni/reviewers.less',
'css/zamboni/themes_review.less',
),
'zamboni/files': (
'css/lib/syntaxhighlighter/shCoreDefault.css',

Просмотреть файл

@ -1,58 +0,0 @@
@import '../devreg/lib_old';
.edit_with_prefix {
-webkit-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid $light-gray;
background: $faint-gray;
border-radius: 5px;
color: $medium-gray;
padding: 0;
width: 400px;
span, input {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
span {
border-right: 0 none;
display: block;
float: left;
line-height: 1.2;
overflow: hidden;
max-width: 215px;
padding: 5px;
text-overflow: ellipsis;
white-space: nowrap;
}
input[type=text] {
border-radius: 0 5px 5px 0;
box-shadow: none;
border: 0;
float: right;
width: 170px !important;
}
}
.error .edit_with_prefix {
border-color: $red;
}
.simple-field {
.hint {
color: $gray;
display: block;
font-size: 11px;
margin-top: 4px;
}
}
.hint-inline {
color: $gray;
font-weight: normal;
font-size: 11px;
padding-left: 5px;
}
label .hint-inline:only-child {
font-size: 12px;
padding: 0;
}

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,81 +0,0 @@
// Colors
$bg = #eff1f3;
$bg-gray = #f8f8f8;
$black = #000;
$blue = #258;
$border-black = rgba(#000, .2);
$border-blue = #C9DDF2;
$border-gray = #ddd;
$dark-gray = #333;
$dumpy-brown = #A49460;
$error-red = #C00000;
$faint-blue = #ECF5FE;
$faint-gray = #eee;
$gray = #888;
$green = #093;
$inset-blue = rgba(152,178,201,.3);
$light-gray = #ccc;
$light-green = #4b0;
$link = #447BC4;
$maroon = #800;
$medium-gray = #666;
$mobileborder = #d7d2c3;
$note-gray = #999;
$notice-yellow = #FAF2BD;
$orange = #e60;
$reviewer-header-purple = #563C4B;
$red = #C63717;
$shadow-blue = #98B2C9;
$tab-stripe = #f7f5f3;
$tab-taupe = #efede8;
$taupe = rgb(215,210,195);
$teal = #5875A0;
$text = #424f5a;
$white = #fff;
$border-taupe = darken($taupe, 10%);
$faded-blue = rgba($border-blue,.1);
$faded-taupe = rgba($taupe,.1);
// Button Colors
$button-green-light = #81bc2e;
$button-green-dark = #659324;
$button-red-light = #da5132;
$button-red-dark = #a91300;
// Font Stacks
$open-stack = "Feura Sans", FeuraSansWeb, "Open Sans", "Helvetica Neue", Arial, sans-serif;
transform($tform) {
-webkit-transform: $tform;
-moz-transform: $tform;
-ms-transform: $tform;
transform: $tform;
}
transition($property) {
-moz-transition: $property;
-webkit-transition: $property;
transition: $property;
}
border-box() {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
ellipsis() {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
gradient-two-color($color1, $color2) {
background-color: $color2;
background-image: -webkit-gradient(linear, left bottom, left top, from($color1), to($color2));
background-image: linear-gradient($color1, $color2);
background-image: -webkit-linear-gradient($color1, $color2);
}

Просмотреть файл

@ -1,6 +1,84 @@
@import 'themes_lib';
// Colors
@bg: #eff1f3;
@bg-gray: #f8f8f8;
@black: #000;
@blue: #258;
@border-black: rgba(0,0,0,.2);
@border-blue: #C9DDF2;
@border-gray: #ddd;
@dark-gray: #333;
@dumpy-brown: #A49460;
@error-red: #C00000;
@faint-blue: #ECF5FE;
@faint-gray: #eee;
@gray: #888;
@green: #093;
@inset-blue: rgba(152,178,201,.3);
@light-gray: #ccc;
@light-green: #4b0;
@link: #447BC4;
@maroon: #800;
@medium-gray: #666;
@mobileborder: #d7d2c3;
@note-gray: #999;
@notice-yellow: #FAF2BD;
@orange: #e60;
@reviewer-header-purple: #563C4B;
@red: #C63717;
@shadow-blue: #98B2C9;
@tab-stripe: #f7f5f3;
@tab-taupe: #efede8;
@taupe: rgb(215,210,195);
@teal: #5875A0;
@text: #424f5a;
@white: #fff;
$inset-blue = rgba(152, 178, 201, 0.3);
@faded-blue: rgba(201,221,242,.1);
// Button Colors
@button-green-light: #81bc2e;
@button-green-dark: #659324;
@button-red-light: #da5132;
@button-red-dark: #a91300;
// Font Stacks
@open-stack: "Feura Sans", FeuraSansWeb, "Open Sans", "Helvetica Neue", Arial, sans-serif;
.transform(@tform) {
-webkit-transform: @tform;
-moz-transform: @tform;
-ms-transform: @tform;
transform: @tform;
}
.transition(@property) {
-moz-transition: @property;
-webkit-transition: @property;
transition: @property;
}
.border-box() {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.ellipsis() {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.gradient-two-color(@color1, @color2) {
background-color: @color2;
background-image: -webkit-gradient(linear, left bottom, left top, from(@color1), to(@color2));
background-image: linear-gradient(@color1, @color2);
background-image: -webkit-linear-gradient(@color1, @color2);
}
@inset-blue = rgba(152, 178, 201, 0.3);
ul {
margin-bottom: 0;
@ -10,14 +88,13 @@ ul {
.sidebar {
a.button, button {
// Bluish.
gradient-two-color(#4cb1ff, #1793e5);
btn-shadow();
.gradient-two-color(#4cb1ff, #1793e5);
background-repeat: repeat-x;
border: none;
border-radius: 1px;
color: $white;
color: white;
display: inline-block;
font: 400 14px/48px $open-stack;
font: 400 14px/48px @open-stack;
height: 48px;
min-width: 100px;
white-space: nowrap;
@ -26,23 +103,22 @@ ul {
text-decoration: none;
&:hover, &:focus {
gradient-two-color(darken(#4cb1ff, 10%), darken(#1793e5, 10%));
.gradient-two-color(#2ba3ff, #1584ce);
text-decoration: none;
}
&:hover, &:focus, &:active {
color: darken($white, 10%);
color: darken(white, 10%);
}
&:active {
btn-shadow-active();
border: 1px solid darken(#1793e5, 10%);
border: 1px solid #1584ce;
}
}
}
.island {
gradient-two-color(#FCFDFE, #F4F8FC);
.gradient-two-color(#FCFDFE, #F4F8FC);
background: #FCFDFE;
border: 1px solid $border-blue;
border: 1px solid @border-blue;
border-radius: 5px;
display: block;
margin-bottom: 15px;
@ -50,8 +126,8 @@ ul {
}
h2.theme-queue-header {
color: #EE6600
font: normal 28px $open-stack normal;
color: #EE6600;
font: normal 28px @open-stack normal;
font-weight: normal;
float: left;
}
@ -74,7 +150,7 @@ nav.theme-review {
content: "|";
}
&.active a {
color: $orange;
color: @orange;
cursor: default;
&:hover {
@ -85,7 +161,7 @@ nav.theme-review {
}
h2 a:last-child {
color: $link;
color: @link;
}
.zoombox {
@ -115,13 +191,13 @@ h2 a:last-child {
font-weight: normal;
}
.box {
border: 1px solid $light-gray;
border: 1px solid @light-gray;
border-radius: 2px;
margin-bottom: 15px;
padding: 0 13px 13px;
h2 {
color: $dark-gray;
color: @dark-gray;
font: 18px Georgia, serif;
margin-bottom: 0;
}
@ -141,7 +217,7 @@ h2 a:last-child {
}
.options, .shortcuts {
background: #fff;
border-color: $light-gray;
border-color: @light-gray;
}
fieldset {
margin-top: 7px;
@ -160,7 +236,7 @@ h2 a:last-child {
margin-left: 20px;
}
&:nth-child(2) {
border-bottom: 1px dotted $shadow-blue;
border-bottom: 1px dotted @shadow-blue;
margin: 2px 0;
padding-bottom: 7px;
}
@ -173,11 +249,11 @@ h2 a:last-child {
width: 100%;
}
button#commit {
background: darken($button-green-dark, 15%);
background: #567d1f;
position: relative;
&:hover {
background: darken($button-green-light, 15%);
background: #6ea027;
}
&:before {
background-image: url('../../img/sprites/mkt-reviewer-icons/page_white_edit.png');
@ -225,7 +301,7 @@ h2 a:last-child {
&.single {
.theme {
opacity: .30;
transition(opacity .4s);
.transition(opacity .4s);
&:hover, &.active {
opacity: 1;
}
@ -235,20 +311,20 @@ h2 a:last-child {
.theme {
background: #fff;
border: 1px solid $border-blue;
border: 1px solid @border-blue;
border-radius: 3px;
margin-bottom: 25px;
padding: 0 13px 13px 13px;
position: relative;
h2 {
font: 20px $open-stack normal;
font: 20px @open-stack normal;
margin: 10px 0 5px;
}
.preview, .header, .footer {
margin: 13px 0;
border: 2px solid $border-blue;
background: $faded-blue;
border: 2px solid @border-blue;
background: @faded-blue;
}
.preview {
position: relative;
@ -278,10 +354,10 @@ h2 a:last-child {
top: 0;
&.red {
background: $button-red-dark;
background: @button-red-dark;
}
&.green {
background: $button-green-dark;
background: @button-green-dark;
}
&.reviewed {
display: block;
@ -318,7 +394,7 @@ h2 a:last-child {
font-weight: bold;
&:before {
color: $note-gray;
color: @note-gray;
content: "/";
margin: 0 7px 0 4px;
}
@ -355,17 +431,17 @@ h2 a:last-child {
font-size: inherit;
&.approve {
background: $button-green-dark;
background: @button-green-dark;
&:hover {
background: $button-green-light;
background: @button-green-light;
}
}
&.reject, &.duplicate, &.flag {
background: $button-red-dark;
background: @button-red-dark;
&:hover {
background: $button-red-light;
background: @button-red-light;
}
}
}
@ -380,13 +456,13 @@ h2 a:last-child {
}
}
.theme.active {
box-shadow: 0 0 1px 1px $light-gray;
box-shadow: 0 0 1px 1px @light-gray;
}
.rq-dropdown {
background: #fff;
border: 1px solid $border-blue;
box-shadow: 0 1px 2px $light-gray;
border: 1px solid @border-blue;
box-shadow: 0 1px 2px @light-gray;
display: none;
float: right;
margin-top: 7px;
@ -397,17 +473,17 @@ h2 a:last-child {
&:before {
background: #fff;
box-shadow: 1px 1px 0 rgba(255,255,255,.5) inset, -1px -1px 0 $border-blue;
box-shadow: 1px 1px 0 rgba(255,255,255,.5) inset, -1px -1px 0 @border-blue;
content: "";
height: 14px;
position: absolute;
top: -7px;
transform(rotate(45deg));
.transform(rotate(45deg));
width: 14px;
z-index: 0;
}
label:first-child {
color: $dark-gray;
color: @dark-gray;
display: block;
font-weight: bold;
margin: 3px 0 6px;
@ -425,7 +501,7 @@ h2 a:last-child {
.req {
display: inline;
}
color: $red;
color: @red;
display: none;
float: left;
font-weight: bold;
@ -456,13 +532,13 @@ h2 a:last-child {
float: left;
}
span {
color: $link;
color: @link;
display: block;
margin-left: 20px;
}
}
li:hover {
background: $inset-blue;
background: @inset-blue;
cursor: pointer;
}
}
@ -487,7 +563,7 @@ h2 a:last-child {
margin-bottom: 12px;
span {
color: $link;
color: @link;
display: inline;
margin-bottom: 0;
}
@ -505,14 +581,14 @@ h2 a:last-child {
width: 100%;
tr {
color: $dark-gray;
color: @dark-gray;
line-height: 39px;
}
tr:nth-child(even) {
background: $inset-blue;
background: @inset-blue;
}
thead {
background: $border-blue;
background: @border-blue;
}
th {
font-weight: bold;
@ -619,7 +695,7 @@ p.total {
margin-bottom: 0;
}
div.featured {
border: 1px solid $light-gray;
border: 1px solid @light-gray;
}
#reviewers-stats-charts .listing-header {
padding: 15px 10px;
@ -633,8 +709,8 @@ div.featured-inner {
tr.listing-header,
div.listing-header,
#reviewers-score-bar {
gradient-two-color(#fff, darken(#fff, 3%));
border: 1px solid $light-gray;
.gradient-two-color(#fff, darken(#fff, 3%));
border: 1px solid @light-gray;
}
#search-island {
@ -644,7 +720,7 @@ div.listing-header,
}
.addon-id {
background: #fff;
border: 1px solid $light-gray;
border: 1px solid @light-gray;
border-radius: 5px;
margin-right: 5px;
padding: 3px;