Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Split and tidy up stylesheets #3165

Merged
merged 1 commit into from
Apr 22, 2016
Merged

Split and tidy up stylesheets #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 0 additions & 84 deletions core/app/assets/stylesheets/refinery/_mixins.scss
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions core/app/assets/stylesheets/refinery/_tooltips.scss
View file
Open in desktop

This file was deleted.

209 changes: 209 additions & 0 deletions core/app/assets/stylesheets/refinery/components/_dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
/* dialog stuff */

#dialog_container #content .field,
.dialog_container .field {
width: auto;
margin: 5px 0;
}
#dialog-form-actions .pagination {
margin: -4px 6px -4px 0px;
float: right;
width: auto;
a,
.current,
.disabled{
line-height: 15px;
}
}
#dialog_frame {
width:952px;
height:460px;
padding: 0px;
border: 0px solid #F2F1ED;
}
.visual_editor_hideables {
display: none;
}
#content .form-actions,
.wym_dialog .form-actions,
.ui-dialog .form-actions {
@include form-actions;
}
.dialog {
form {
margin-bottom: 45px;
}
.dialog_area > div > .field label:first-child,
.dialog_area > div > label:first-child {
margin-top: 0px;
}
}
.visual_editor_dialog .form-actions,
#content.form-actions.dialog-form-actions,
.ui-dialog .form-actions {
margin-top: 16px;
}
#content .form-actions .form-actions-left,
#content .form-actions .form-actions-right,
.visual_editor_dialog .form-actions .form-actions-left,
.visual_editor_dialog .form-actions .form-actions-right,
.ui-dialog .form-actions .form-actions-left,
.ui-dialog .form-actions .form-actions-right {
position: absolute;
top: 10px;
}
#content .form-actions .form-actions-left,
.visual_editor_dialog .form-actions .form-actions-left,
.ui-dialog .form-actions .form-actions-left {
left: 10px;
}
#content .form-actions .form-actions-right,
.visual_editor_dialog .form-actions .form-actions-right,
.ui-dialog .form-actions .form-actions-right {
right: 10px;
}
#content .form-actions .save-loader {
position: absolute;
right: -24px;
top: 4px;
}
.visual_editor_dialog .form-actions, .ui-dialog .form-actions {
border: 0px none;
border-top: 1px solid #E8E8E8;
}
#dialog_iframe {
position: relative;
}
#dialog_container #content .form-actions,
.ui-dialog .form-actions,
.dialog_container .form-actions {
position: absolute;
bottom: 0px;
left: 0px;
right: 0px;
border-right: 0px;
border-left: 0px;
border-bottom: 0px;
width: auto;
}
#dialog_container.dialog.iframed #content .form-actions {
position: fixed;
}
body.dialog #content .search_form {
float: right;
width: auto !important;
min-width: 300px;
margin-bottom: 0px;
}
.ui-dialog {
position: absolute;
background-color: #fff;
color: #000;
border: 4px solid #22A7F2;
width: auto;
z-index: 1;
#dialog_loading {
position: fixed;
top: 50%;
left: 50%;
width: 208px;
height: 13px;
margin: -6px 0 0 -104px;
}
.ui-dialog-titlebar {
position: relative;
width: 100%;
height: 33px;
background-color: #22A7F2;
}
.ui-dialog-title {
float: left;
height: 33px;
line-height: 33px;
font-size: 16px;
padding-left: 10px;
color: white;
}
.ui-dialog-titlebar-close {
background-color: #22A7F2;
padding-right:0;
padding-left:0;
padding-top: 5px;
position: absolute;
right: 10px;
width: 22px;
height: 33px;
line-height: 33px;
border: none;
span {
display: block;
margin: 1px;
background: transparent image_url('refinery/cross.png') top left no-repeat;
text-indent:-10000px;
}
}
.ui-dialog-titlebar-close:hover, .ui-dialog-titlebar-close:focus {
padding: 0;
}
iframe {
clear:both;
border: 0px none;
margin-bottom:-1px;
margin-top:1px;
width: 100% !important;
}
}
.ui-dialog[aria-describedby=editor_dialog],
.ui-dialog[aria-describedby=dialog_iframe] {
outline: none;

&.ui-dialog {
padding: 0;
}
&.ui-corner-all {
border: 4px solid #22A7F2;
border-radius: 0;
}
&.ui-widget {
font-family: inherit;
color: inherit;
}
.ui-widget-header {
background-image: none;
&.ui-corner-all {
border: none;
border-radius: 0;
}
}
.ui-dialog-titlebar {
padding: 0;
.ui-dialog-title {
font-weight: normal;
}
.ui-dialog-titlebar-close {
background-color: #22A7F2;
background-image: none;
border: none;
outline: none;
cursor: pointer;
right: 10px;
.ui-button-text {
display: none;
}
&.ui-button-icon-only .ui-icon {
position: static;
height: 20px;
}
}
}
.ui-dialog-content {
padding: 0;
overflow: visible;
}
.editor_dialog {
border: none;
}
iframe#dialog_frame, iframe#dialog_iframe {
display: block !important;
}
}
34 changes: 5 additions & 29 deletions ...p/assets/stylesheets/refinery/_icons.scss → ...ylesheets/refinery/components/_icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,14 @@

// we use a content block in the basic icon mixin
@mixin icon-base($colour, $size, $float:none) {
@content;
&:before {
@extend .fa;
font-size: $size;
color: $colour;
text-decoration: none;
width: auto;
height:auto;
float:$float;
}
}

// Any icon
@mixin icon($icon-selector, $color: $icon_default_colour, $padding: 4px, $size: 1.2em, $float: none) {
@include icon-base($color, $size, $float) {
@extend .fa-#{$icon-selector};
&:before {margin-right: 0.1em!important;}
};
}


%icon-font { font-family: 'FontAwesome', Helvetica, Arial, sans-serif; }

/* icons */

.add_icon {@include icon('plus-circle');}
.back_icon {@include icon('arrow-left');}
.close_icon {@include icon('times-circle')}
.delete_icon, .delete_section_icon {@include icon('minus-circle', $icon_delete_colour);}

.delete_icon,
.delete_section_icon {@include icon('minus-circle', $icon_delete_colour);}

.download_icon {@include icon('download');}
.edit_email_icon {@include icon('envelope-o');}
.edit_icon {@include icon('edit', $icon_edit_colour);}
Expand All @@ -39,10 +18,7 @@
.folder_icon {@include icon('folder',$icon_folder_colour)}
.go_icon {@include icon('caret-square-o-right');}
.info_icon {@include icon('info-circle');}
.loading_icon {
@include icon('spinner');
@extend .fa-spin
}
.loading_icon {@include icon('spinner'); @extend .fa-spin}
.page_icon {@include icon('file-o',$icon_page_colour)}
.preview_icon {@include icon('eye', $icon_preview_colour)}
.remove_icon {@include icon('unlink', $icon_delete_colour);}
Expand Down
Loading