Skip to content

Commit a114a8c

Browse files
committed
Merge pull request #1 from jmchilton/reports_newpage_2
Refactor reports styling out into its own less file.
2 parents 33154aa + 1b23081 commit a114a8c

6 files changed

Lines changed: 43 additions & 37 deletions

File tree

client/galaxy/style/less/base.less

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,32 +1705,3 @@ div.toolTitleNoSection
17051705
#for_bears {
17061706
display: none;
17071707
}
1708-
1709-
// ============================================================================ Reports Webapp
1710-
1711-
.dir_arrow {
1712-
visibility: hidden
1713-
}
1714-
1715-
#spark_time_select {
1716-
display: inline-block;
1717-
}
1718-
1719-
#spark_select {
1720-
height: 23px;
1721-
width: 30px;
1722-
padding: 0;
1723-
border-radius: 2px;
1724-
}
1725-
1726-
.quarter_width {
1727-
width: 25%;
1728-
}
1729-
1730-
.third_width {
1731-
width: 30%;
1732-
}
1733-
1734-
.half_width {
1735-
width: 50%
1736-
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// ============================================================================ Reports Webapp
2+
3+
.dir_arrow {
4+
visibility: hidden
5+
}
6+
7+
#spark_time_select {
8+
display: inline-block;
9+
}
10+
11+
#spark_select {
12+
height: 23px;
13+
width: 30px;
14+
padding: 0;
15+
border-radius: 2px;
16+
}
17+
18+
.quarter_width {
19+
width: 25%;
20+
}
21+
22+
.third_width {
23+
width: 30%;
24+
}
25+
26+
.half_width {
27+
width: 50%
28+
}

client/grunt-tasks/style.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ module.exports = function( grunt ){
2020
'masthead',
2121
'library',
2222
'trackster',
23-
'circster'
23+
'circster',
24+
'reports'
2425
];
2526

2627

@@ -79,4 +80,4 @@ module.exports = function( grunt ){
7980
});
8081

8182
grunt.registerTask( 'style', [ 'sprite', 'less-site-config', 'less', 'clean' ] );
82-
};
83+
};

static/style/blue/base.css

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/style/blue/reports.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.dir_arrow{visibility:hidden}
2+
#spark_time_select{display:inline-block}
3+
#spark_select{height:23px;width:30px;padding:0;border-radius:2px}
4+
.quarter_width{width:25%}
5+
.third_width{width:30%}
6+
.half_width{width:50%}

templates/webapps/reports/base_panels.mako

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<%inherit file="/base/base_panels.mako"/>
22

3+
<%def name="stylesheets()">
4+
${parent.stylesheets()}
5+
${h.css( "reports" )}
6+
</%def>
7+
8+
39
## Default title
410
<%def name="title()">Galaxy Reports</%def>
511

0 commit comments

Comments
 (0)