TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up/normalise whitespace in Sass, CSS

Browse Source 
Signed-off-by: Alex Coles <alex@alexbcoles.com>
pull/1327/head
Alex Coles 11 years ago
parent ee0359ac49
commit b32a5c9e51
21 changed files with 53 additions and 70 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      app/assets/stylesheets/_reset.sass
  2. 2
      app/assets/stylesheets/_work_packages.scss
  3. 1
      app/assets/stylesheets/content/_action_menu_main.sass
  4. 1
      app/assets/stylesheets/content/_calendar.sass
  5. 2
      app/assets/stylesheets/content/_flash_messages.sass
  6. 8
      app/assets/stylesheets/content/_headings.sass
  7. 1
      app/assets/stylesheets/content/_links.sass
  8. 2
      app/assets/stylesheets/content/_modal.sass
  9. 1
      app/assets/stylesheets/content/_my_page.sass
  10. 2
      app/assets/stylesheets/content/_wiki.sass
  11. 8
      app/assets/stylesheets/content/_work_packages_table.sass
  12. 9
      app/assets/stylesheets/fonts/_openproject_icon_font.sass
  13. 28
      app/assets/stylesheets/global/_mixins.sass
  14. 16
      app/assets/stylesheets/global/_variables.sass
  15. 1
      app/assets/stylesheets/jstoolbar.css.sass
  16. 1
      app/assets/stylesheets/layout/_breadcrumb.sass
  17. 8
      app/assets/stylesheets/layout/_drop_down.sass
  18. 1
      app/assets/stylesheets/layout/_footer.sass
  19. 1
      app/assets/stylesheets/layout/_main_menu.sass
  20. 8
      app/assets/stylesheets/print.css
  21. 21
      app/assets/stylesheets/rtl.css

1
app/assets/stylesheets/_reset.sass
Unescape View File

@ -41,4 +41,3 @@ blockquote, q
table
border-collapse: collapse
border-spacing: 0

2
app/assets/stylesheets/_work_packages.scss
Unescape View File

@ -46,4 +46,4 @@ See doc/COPYRIGHT.rdoc for more details.
select.to-validate.ng-dirty.ng-valid, input.to-validate.ng-dirty.ng-valid { border:1px solid Green; }
select.to-validate.ng-dirty.ng-invalid, input.to-validate.ng-dirty.ng-invalid { border:1px solid Red; }
select.to-validate.ng-dirty.ng-valid ~ span.ok, input.to-validate.ng-dirty.ng-valid ~ span.ok { color:green; display:inline; }
select.to-validate.ng-dirty.ng-invalid ~ span.ko, input.to-validate.ng-dirty.ng-invalid ~ span.ko { color:red; display:inline; }
select.to-validate.ng-dirty.ng-invalid ~ span.ko, input.to-validate.ng-dirty.ng-invalid ~ span.ko { color:red; display:inline; }

1
app/assets/stylesheets/content/_action_menu_main.sass
Unescape View File

@ -66,4 +66,3 @@
@include icon-action-menu-rules
.icon-sub-menu
@include icon-sub-menu-rules

1
app/assets/stylesheets/content/_calendar.sass
Unescape View File

@ -74,4 +74,3 @@ table.cal
p.cal.legend span
display: block

2
app/assets/stylesheets/content/_flash_messages.sass
Unescape View File

@ -57,5 +57,3 @@ div.flash.notice
div.flash.warning, .nodata, .warning
background-color: $content_flash_warning_msg_bg_color

8
app/assets/stylesheets/content/_headings.sass
Unescape View File

@ -29,15 +29,13 @@
#content
h2
padding-right: 340px
h1
@include default-headline-h1
h2
@include default-headline-h2
h3
@include default-headline-h3
h4
h4
@include default-headline-h4

1
app/assets/stylesheets/content/_links.sass
Unescape View File

@ -62,4 +62,3 @@ a.icon:hover, a.icon-context:hover
#content table th a.no-decoration-on-hover:hover, a.no-decoration-on-hover:hover
text-decoration: none

2
app/assets/stylesheets/content/_modal.sass
Unescape View File

@ -57,7 +57,7 @@ $ng-modal-image-width: $ng-modal-image-height
i
float: right
cursor: pointer
label
padding: 0 50px 0 0
input

1
app/assets/stylesheets/content/_my_page.sass
Unescape View File

@ -57,4 +57,3 @@ div.mypage-box p.summary
div.mypage-box div.overview p.author
margin-bottom: 7px

2
app/assets/stylesheets/content/_wiki.sass
Unescape View File

@ -164,4 +164,4 @@ h1:hover, h2:hover, h3:hover
.controller-wiki
#content
overflow: visible
overflow: visible

8
app/assets/stylesheets/content/_work_packages_table.sass
Unescape View File

@ -41,7 +41,7 @@
opacity: 1
&.ng-leave
@include animation(0.5s fade-out)
table.workpackages-table
border-collapse: collapse
width: 100%
@ -64,7 +64,7 @@ table.workpackages-table
tr td
text-align: left
line-height: 34px
&.icon-table
&.icon-table
font-size: 20px
&.checkbox
width: 20px
@ -72,7 +72,7 @@ table.workpackages-table
width: 20px
p
padding: 0 8px
margin: 0
margin: 0
p:hover
background: #fff598
@ -83,4 +83,4 @@ div.active-column
border: 1px solid #dddddd
height: 139px
width: 105px
background: none
background: none

9
app/assets/stylesheets/fonts/_openproject_icon_font.sass
Unescape View File

@ -73,7 +73,7 @@
@mixin icon-button-rules
padding: 0 5px 0 0
font-size: 13px
@mixin icon-dropdown-menu-rules
padding: 0 8px 0 0
font-size: 14px
@ -84,14 +84,14 @@
@mixin icon-table-rules
padding: 0 0 0 0
@mixin icon-action-menu-rules
padding: 0 10px 0 0
font-size: 15px
line-height: 5px
vertical-align: -40%
@mixin icon-sub-menu-rules
@mixin icon-sub-menu-rules
padding: 0 0 0 0
float: right
font-size: 15px
@ -883,4 +883,3 @@ dt > .icon-wiki-page:before,
.icon-pre:before
content: "\e0d9"

28
app/assets/stylesheets/global/_mixins.sass
Unescape View File

@ -42,34 +42,34 @@ $button_gray_font_color: #222222
font-size: $headline_h1_font_size
font-family: $font_family_normal
font-weight: normal
padding: 0 0 8px 0
margin: 0
padding: 0 0 8px 0
margin: 0
@mixin default-headline-h2
color: $headline_h2_font-color
font-size: $headline_h2_font_size
font-family: $font_family_normal
font-weight: normal
text-transform: uppercase
padding: 0 0 8px 0
margin: 0
text-transform: uppercase
padding: 0 0 8px 0
margin: 0
@mixin default-headline-h3
color: $headline_h3_font-color
font-size: $headline_h3_font_size
font-family: $font_family_normal
font-weight: normal
border-bottom: 1px solid #dddddd
padding: 0 0 8px 0
margin: 0 0 20px 0
border-bottom: 1px solid #dddddd
padding: 0 0 8px 0
margin: 0 0 20px 0
@mixin default-headline-h4
color: $headline_h4_font-color
font-size: $headline_h4_font_size
font-family: $font_family_normal
font-weight: normal
padding: 0 0 5px 0
margin: 0 0 20px 0
padding: 0 0 5px 0
margin: 0 0 20px 0
@mixin default-font-normal($color, $font-size: 13px)
color: $color
@ -133,7 +133,7 @@ $button_gray_font_color: #222222
background: -o-linear-gradient(top, #ffffff 0%,#eeeeee 40%,#ddd 100%)
background: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 40%,#ddd 100%)
background: linear-gradient(to bottom, #ffffff 0%,#eeeeee 40%,#ddd 100%)
@mixin button-active-background
border: 1px solid #CCCCCC
background: #EEEEEE
@ -163,7 +163,7 @@ $button_gray_font_color: #222222
color: $button_highlight_font_hover_color
&:hover
text-decoration: none
@mixin button
color: $button_font_color
@include button-common
@ -172,13 +172,13 @@ $button_gray_font_color: #222222
color: $button_font_hover_color
&:hover
text-decoration: none
@mixin button-active
color: $button_active_font_color
@include button-common
@include button-normal-size
@include button-active-background
&:hover
text-decoration: none

16
app/assets/stylesheets/global/_variables.sass
Unescape View File

@ -30,14 +30,14 @@ $global_font_color: #555555 !default
$global_font_size: 13px !default
$global_line_height: 1.5 !default
$headline_h1_font_size: 28px !default
$headline_h1_font-color: #555555 !default
$headline_h2_font_size: 22px !default
$headline_h2_font-color: #06799F !default
$headline_h3_font_size: 19px !default
$headline_h3_font-color: #555555 !default
$headline_h4_font_size: 17px !default
$headline_h4_font-color: #555555 !default
$headline_h1_font_size: 28px !default
$headline_h1_font-color: #555555 !default
$headline_h2_font_size: 22px !default
$headline_h2_font-color: #06799F !default
$headline_h3_font_size: 19px !default
$headline_h3_font-color: #555555 !default
$headline_h4_font_size: 17px !default
$headline_h4_font-color: #555555 !default
$header_height: 55px !default
$header_bg_color: #3493B3 !default

1
app/assets/stylesheets/jstoolbar.css.sass
Unescape View File

@ -123,4 +123,3 @@
.jstb_img:before
content: "\e06c"

1
app/assets/stylesheets/layout/_breadcrumb.sass
Unescape View File

@ -85,4 +85,3 @@ ul.breadcrumb
#breadcrumb a.breadcrumb-project-title
font-size: $breadcrumb_highlighted_font_size

8
app/assets/stylesheets/layout/_drop_down.sass
Unescape View File

@ -35,7 +35,7 @@
#settingsDropdown
margin: 10px 0 0 0
.dropdown
position: absolute
z-index: 9999999
@ -109,7 +109,7 @@
line-height: 18px
padding: 3px 32px
white-space: nowrap
.dropdown .dropdown-menu LI > A:hover,
.dropdown .dropdown-menu LABEL:hover
background-color: #F0F0F0
@ -122,7 +122,7 @@
line-height: 18px
padding: 3px 10px
white-space: nowrap
.dropdown .dropdown-menu .dropdown-divider
font-size: 1px
@ -135,5 +135,3 @@
padding-left: 30px
background-position: 8px center
background-repeat: no-repeat

1
app/assets/stylesheets/layout/_footer.sass
Unescape View File

@ -47,4 +47,3 @@
a
text-decoration: underline
@include default-font-normal($footer_content_link_color)

1
app/assets/stylesheets/layout/_main_menu.sass
Unescape View File

@ -264,4 +264,3 @@ $toggler-width: 40px
border: none
li a
padding: 0px

8
app/assets/stylesheets/print.css
Unescape View File

@ -32,9 +32,9 @@ See doc/COPYRIGHT.rdoc for more details.
#top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
#main { background: #fff; }
#content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
#wiki_add_attachment { display:none; }
#wiki_add_attachment { display:none; }
.hide-when-print { display: none; }
.autoscroll {overflow-x: visible;}
table.list {margin-top:0.5em;}
table.list th, table.list td {border: 1px solid #aaa;}
.autoscroll {overflow-x: visible;}
table.list {margin-top:0.5em;}
table.list th, table.list td {border: 1px solid #aaa;}
}

21
app/assets/stylesheets/rtl.css
Unescape View File

@ -38,18 +38,18 @@ body, #wrapper { direction: rtl;}
#top-menu li { float: right; }
.tabular label.floating
{
margin-right: 0;
margin-left: auto;
text-align: right;
margin-right: 0;
margin-left: auto;
text-align: right;
}
.tabular label
.tabular label
{
float: right;
margin-left: auto;
float: right;
margin-left: auto;
}
.tabular p
{
clear: right;
clear: right;
}
.tabular label.block { text-align: right; }
.icon
@ -60,9 +60,9 @@ body, #wrapper { direction: rtl;}
}
div#activity dt, #search-results dt
{
background-position: 100% 50%;
padding-right: 20px;
padding-left: 0px;
background-position: 100% 50%;
padding-right: 20px;
padding-left: 0px;
}
#content .tabs ul li { float: right; }
#content .tabs ul { padding-left: auto; padding-right: 1em; }
@ -89,4 +89,3 @@ div#issue-changesets div.wiki { direction: ltr; padding-left: 2em }
#activity dt, .journal { clear: right; }
.journal-link { float: left; }
div.wiki pre { direction: ltr; }

Write Preview
Loading…
Cancel
Save