Skip to content

Commit

Permalink
WEB-60 - View image styles
Browse files Browse the repository at this point in the history
  • Loading branch information
mgallego committed Feb 17, 2013
1 parent b3d5af7 commit 71d7e50
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 231 deletions.
6 changes: 6 additions & 0 deletions src/SFM/PicmntBundle/Resources/public/less/forms.less
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ input[type="text"], select, textarea, input[type="password"],input[type="email"]
background: @textareaBackgroundColor; background: @textareaBackgroundColor;
.textareaBackground; .textareaBackground;
} }

.fake-input {
background: @header-background-color !important;
border: 0 !important;
width: 20px;
}
149 changes: 0 additions & 149 deletions src/SFM/PicmntBundle/Resources/public/less/img_box.less

This file was deleted.

8 changes: 4 additions & 4 deletions src/SFM/PicmntBundle/Resources/public/less/picmnt.less
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@


@import 'forms.less'; @import 'forms.less';
@import 'buttons.less'; @import 'buttons.less';
@import 'sliders.less';


@import 'thumbs.less'; @import 'thumbs.less';

@import 'header.less'; @import 'header.less';

@import 'footer.less'; @import 'footer.less';


@import 'edit_image.less'; @import 'edit_image.less';


@import 'alert.less';


@import 'img_box.less'; //@import 'img_box.less';


@import 'user.less'; @import 'user.less';
@import 'alert.less';
@import 'uploads.less'; @import 'uploads.less';
@import 'profile.less'; @import 'profile.less';


35 changes: 28 additions & 7 deletions src/SFM/PicmntBundle/Resources/public/less/scaffolding.less
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -48,27 +48,37 @@
} }


.row { .row {
margin-bottom: 20px; margin-top: 20px;
} }


.row_1 { .row_1 {
margin-bottom: 40px; margin-top: 40px;
}

.span {
margin-left: 5px;
margin-right: 5px;
} }


.span_1 { .span_1 {
margin: 0 5px; margin-left: 5px;
margin-right: 5px;
} }


.span_2 { .span_2 {
margin: 0 10px; margin-left: 10px;
margin-right: 10px;
}

.span-medium {
padding-bottom: 50px !important;
} }


.minor-import { .minor-import {
color: @darkGrey; color: @darkGrey;
font-size: 0.9em; font-size: 0.9em;
} }



.accent:hover { .accent:hover {
background: @accentColor; background: @accentColor;
} }
Expand All @@ -85,6 +95,17 @@
display: inline; display: inline;
} }


li.large {
min-height: 60px;

/////// IMG BOX
.img-box {
background: @header-background-color;
border: 1px solid @boxBorderColor;
margin-bottom: 10px;
padding: 5px;
}

.inline {
display: inline-block !important;
} }
6 changes: 6 additions & 0 deletions src/SFM/PicmntBundle/Resources/public/less/sliders.less
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,6 @@
.slider {
background: white;
width: 190px;
margin: 0 auto;
margin-bottom: 20px;
}
9 changes: 7 additions & 2 deletions src/SFM/PicmntBundle/Resources/public/less/thumbs.less
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
.img-thumb { .img-thumb {
position: relative; position: relative;
margin: 8px; margin: 8px;
height: @thumbMediumHeight; height: @thumbLargeHeight;
width: @thumbMediumWidth; width: @thumbLargeWidth;
} }




Expand Down Expand Up @@ -53,3 +53,8 @@
height: @thumbSmallHeight; height: @thumbSmallHeight;
width: @thumbSmallWidth; width: @thumbSmallWidth;
} }

.thumb-medium {
height: @thumbMediumHeight;
width: @thumbMediumWidth;
}
5 changes: 5 additions & 0 deletions src/SFM/PicmntBundle/Resources/public/less/type.less
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ li {
line-height: @baseLineHeight; line-height: @baseLineHeight;
} }


li.large {
min-height: 60px;
}


// Remove default list styles // Remove default list styles
ul.unstyled, ul.unstyled,
ol.unstyled { ol.unstyled {
Expand Down
6 changes: 4 additions & 2 deletions src/SFM/PicmntBundle/Resources/public/less/variables.less
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -55,5 +55,7 @@
//thumbnails //thumbnails
@thumbSmallWidth: 50px; @thumbSmallWidth: 50px;
@thumbSmallHeight: 50px; @thumbSmallHeight: 50px;
@thumbMediumWidth: 180px; @thumbMediumWidth: 100px;
@thumbMediumHeight: 180px; @thumbMediumHeight: 100px;
@thumbLargeWidth: 180px;
@thumbLargeHeight: 180px;
38 changes: 0 additions & 38 deletions src/SFM/PicmntBundle/Resources/public/less/view_image.less

This file was deleted.

Loading

0 comments on commit 71d7e50

Please sign in to comment.