Skip to content

Commit

Permalink
CMS-650: Convert css to scss, add linting, editors configs, styles co…
Browse files Browse the repository at this point in the history
…nfig
  • Loading branch information
Evgeniy Negometyanov committed Nov 11, 2015
1 parent 1b594a8 commit ef448f2
Show file tree
Hide file tree
Showing 15 changed files with 375 additions and 78 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ share/
/envs
.tox
testenv1
node_modules/
3 changes: 2 additions & 1 deletion .hgignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ build
*.egg-info
.DS_Store
.project
.pydevproject
.pydevproject
node_modules
12 changes: 12 additions & 0 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"preset": "crockford",

"maximumLineLength": {
"value": 120,
"allowRegex": true,
"allowUrlComments": true
},
"disallowQuotedKeysInObjects": null,
"requireMultipleVarDecl": null,
"disallowDanglingUnderscores": null
}
21 changes: 21 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"browser": true,
"devel": true,
"expr": true,
"bitwise": true,
"curly": true,
"eqeqeq": true,
"immed": true,
"indent": 4,
"jquery": true,
"latedef": true,
"newcap": true,
"noarg": true,
"node": true,
"nonbsp": true,
"quotmark": "single",
"strict": true,
"unused": true,
"trailing": true,
"undef": true
}
31 changes: 31 additions & 0 deletions filer/private/config.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Encoding.default_external = 'utf-8'

# Set this to the root of your project when deployed:
http_path = "" # use if other than /
css_dir = "../static/filer/css"
sass_dir = "sass"
images_dir = "../static/filer/img"
javascripts_dir = "../static/filer/js"
fonts_dir = "../static/filer/fonts"

# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed

# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true

# To disable debugging comments that display the original location of your selectors. Uncomment:
# line_comments = false

# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

# Generating sourcemaps often results in merge conflicts so it is advisable
# to leave it turned-off for now.
sass_options = {:sourcemap => false}

# Require any additional compass plugins here.
# require 'bootstrap-sass'
153 changes: 153 additions & 0 deletions filer/private/sass/admin_filer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
#image_container {
position: relative;
img, svg {
position: absolute;
top: 0;
left: 0;
margin: 0;
}
}
.transpTiling {
outline: 1px solid #e3e3e3;
background-image: url('data:image/gif;base64,R0lGODlhCAAIAKECAOPj4/z8/P///////yH5BAEKAAIALAAAAAAIAAgAAAINhBEZh8q6DoTPSWvoKQA7');
&:hover {
background-image: url('data:image/gif;base64,R0lGODlhCAAIAKECAEFBQXR0dP///////yH5BAEKAAIALAAAAAAIAAgAAAINhBEZh8q6DoTPSWvoKQA7');
}
}
#fileUploadFakeLink {
position: relative;
}
#fileInputUploaderContainer {
position: absolute;
top: 0;
left: -8px;
}
.loadingThumb {
width: 32px;
height: 32px;
background-image: url('../img/loading_animation.gif');
background-repeat: no-repeat;
}
#content-top-bar {
margin-bottom: 20px;
.object-tools {
margin-top: -32px;
text-align: right;
li {
display: inline-block !important;
float: none !important;
}
}
.changelink {
padding-left: 15px !important;
border: 0 !important;
font-weight: normal !important;
color: #029eee !important;
background: url('../img/icon_changelink.gif') 0 center no-repeat !important;
background-color: transparent !important;
box-shadow: none !important;
}
}
#changelist-wrapper {
float: left;
width: 80%;
margin-right: 2%;
}
.clipboard {
float: left;
overflow-x: auto;
box-sizing: border-box;
width: 18% !important;
margin-top: -1px !important;
border: 1px solid #ddd !important;
form {
padding-top: 0 !important;
}
table {
margin: 0;
border: 0 !important;
td {
border-color: #ddd;
border-right: 0 !important;
}
th {
padding-top: 1px !important;
padding-bottom: 1px !important;
}
tfoot td {
border-bottom: 0 !important;
}
}
.deletelink {
padding: 4px 10px;
border: 1px solid #999;
background: #e1e1e1 url('../img/button-bg.gif') bottom left repeat-x;
}
tr td.thumbnail {
width: 40px;
}
}
a.insertlinkButton {
padding: 4px;
padding-left: 28px;
background-image: url('../img/select_item.gif');
background-repeat: no-repeat;
&:hover {
background-image: url('../img/select_item-hover.gif');
}
}
a.small_folder_link {
display: block;
float: right;
height: 36px;
padding-right: 4px;
padding-left: 36px;
line-height: 36px;
background-image: url('../icons/plainfolder_32x32.png');
background-repeat: no-repeat;
}
#toolbartable {
overflow-x: auto;
td {
border-right: solid 1px #ddd;
}
th {
border-right: solid 1px #ddd;
}
+ .paginator {
border-right: solid 1px #ddd;
}
}
table thead th.thumbHeader {
width: 52px;
}
.fileUploadQueueItem .fileUploadProgress .fileUploadProgressBar {
background-color: black;
}
.filebrowser #changelist {
overflow: hidden;
.change {
text-align: right;
a {
display: block;
float: right;
}
}
.moveto {
min-width: 180px;
text-align: right;
a {
display: inline-block;
margin-right: 10px;
}
button {
float: right;
}
}
}
h1.folder_header {
margin-bottom: 0;
background-image: url('../img/nav-bg.gif');
background-repeat: repeat-x;
background-position: bottom;
}
3 changes: 3 additions & 0 deletions filer/static/filer/css/admin_filer.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ef448f2

Please sign in to comment.