Skip to content

Commit

Permalink
Copy layout and CSS files into obs_factory namespace
Browse files Browse the repository at this point in the history
Layout view, partials and CSS are now inside webui/obs_factory.
The layout is now called webui/obs_factory/application.html.erb.

The original files will be removed in following commits.

Co-authored-by: David Kang <dkang@suse.com>
  • Loading branch information
saraycp and David Kang committed Sep 6, 2019
1 parent 60c5887 commit 97ee9c3
Show file tree
Hide file tree
Showing 18 changed files with 1,706 additions and 6 deletions.
175 changes: 175 additions & 0 deletions src/api/app/assets/stylesheets/webui/icons.scss

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Place all the styles related to the announcements controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

// TODO: bento_only

#announcements {
.announcement {
background-color: #fff6ef;
border: 1px solid #d2702e;
margin-bottom: 15px;

h3 {
margin: 0;
color: #d2702e;
}

p {
margin-bottom: 10px;
font-size: 0.9em;
color: #666;

a {
font-size: 0.8em;
color: #069;
&:hover { color: #690; }
}
}
}
}

.announcement-actions { margin: 10px; }
21 changes: 21 additions & 0 deletions src/api/app/assets/stylesheets/webui/obs_factory/application.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require mousetrap
*= require peek
*= require webui/icons.css.scss
*= require webui/obs_factory/bento.css.scss
*= require webui/obs_factory/style.css.scss
*= require webui/obs_factory/our-own-jquery-ui.css.scss
*= require webui/obs_factory/flash
*= require webui/obs_factory/utils
*= require webui/obs_factory/announcements.scss
*/

/* Staging projects dashboard table */
.staging-dashboard th.staging-project {
text-align: right;
Expand Down
3 changes: 3 additions & 0 deletions src/api/app/assets/stylesheets/webui/obs_factory/bento.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "bento/reset";
@import "bento/960";
@import "bento/base";

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

Loading

0 comments on commit 97ee9c3

Please sign in to comment.