Skip to content

Commit

Permalink
Updates frontpage and nav topic icon display
Browse files Browse the repository at this point in the history
  • Loading branch information
@philipashlock
philipashlock committed Nov 24, 2014
1 parent f7f9606 commit a71d5c8
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 75 deletions.
2 changes: 1 addition & 1 deletion roots-nextdatagov/assets/css/main.min.css
View file

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions roots-nextdatagov/assets/less/app.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ ul.navbar-nav#menu-primary-navigation.nav > li > a {
.topic-safety a i:before {
content: "\e014";
}
.topic-states a i:before {
.topic-states a i:before,
.topic-local a i:before {
content: "\e015";
}
.topic-weather a i:before {
Expand Down Expand Up @@ -414,7 +415,7 @@ ul.navbar-nav#menu-primary-navigation.nav > li > a {
========================================================================== */

ul.topics {
margin: 0px;
margin: 0 0 15px 0;
padding: 0px;
text-align: center;

Expand All @@ -425,7 +426,7 @@ ul.topics {

a {
display: inline-block;
margin: 0px 10px 15px 10px;
margin: 0px 15px 20px 15px;
outline: 0;
}

Expand All @@ -436,8 +437,8 @@ ul.topics {
width: 100px;
text-align: center;
clear: both;
padding-top: 18px;
font-size: 69px;
padding-top: 16px;
font-size: 65px;
color: @blue-gray; /* @link-color; */

&:hover {
Expand All @@ -447,7 +448,8 @@ ul.topics {

a span {
display: block;
width: 130px;
width: 100px;
font-size : 15px;
word-wrap: break-word;
}

Expand Down Expand Up @@ -499,6 +501,7 @@ ul.topics {
padding-top: 20px;
font-size: 50px;
height: 75px;
width : 75px;
}

a span {
Expand Down
86 changes: 19 additions & 67 deletions roots-nextdatagov/front-page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,18 @@
<li class="topic-food">
<a href="/food"><i></i><span>Agriculture</span></a>
</li>

<li class="topic-business">
<a href="/business"><i></i><span>Business</span></a>
</li>
<li class="topic-climate">
<a href="/climate"><i></i><span>Climate</span></a>
</li>

<!--<li class="topic-consumer">
<a href="/consumer"><i></i><span>Consumer</span></a>
</li>-->
<li class="topic-consumer">
<a href="/consumer"><i></i><span>Consumer</span></a>
</li>
<li class="topic-ecosystems">
<a href="/ecosystems"><i></i><span>Ecosystems</span></a>
</li>
<li class="topic-education">
<a href="/education"><i></i><span>Education</span></a>
</li>
Expand All @@ -54,77 +58,25 @@
<li class="topic-finance">
<a href="/finance"><i></i><span>Finance</span></a>
</li>
<li class="topic-geospatial">
<a href="/geospatial"><i></i><span>Geospatial</span></a>
</li>
<li class="topic-development">
<a href="/development"><i></i><span>Global Development</span></a>
</li>
<li class="topic-health">
<a href="/health"><i></i><span>Health</span></a>
</li>
<li class="topic-jobs-and-skills">
<a href="/jobs-and-skills"><i></i><span>Jobs &amp; Skills</span></a>
</li>

<li class="topic-local">
<a href="/local"><i></i><span>Local Government</span></a>
</li>
<li class="topic-manufacturing">
<a href="/manufacturing"><i></i><span>Manufacturing</span></a>
</li>
<li class="topic-ocean">
<a href="/ocean"><i></i><span>Ocean</span></a>
</li>
<li class="topic-safety">
<a href="/safety"><i></i><span>Public Safety</span></a>
</li>
<li class="topic-research">
<a href="/research"><i></i><span>Science &amp; Research</span></a>
</li>
<li class="topic-weather">
<a href="/weather"><i></i><span>Weather</span></a>
</li>
</ul>


<div id="topic-list">


<ul class="topics collapse" id="more-topics">
<li class="topic-business">
<a href="/business"><i></i><span>Business</span></a>
</li>
<li class="topic-cities">
<a href="/cities"><i></i><span>Cities</span></a>
</li>
<!-- <li class="topic-climate">
<a href="/climate"><i></i><span>Climate</span></a>
</li>-->
<li class="topic-consumer">
<a href="/consumer"><i></i><span>Consumer</span></a>
</li>
<li class="topic-counties">
<a href="/counties"><i></i><span>Counties</span></a>
</li>
<li class="topic-ethics">
<a href="https://explore.data.gov/ethics"><i></i><span>Ethics</span></a>
</li>
<li class="topic-law">
<a href="/law"><i></i><span>Law</span></a>
</li>
<li class="topic-manufacturing">
<a href="/manufacturing"><i></i><span>Manufacturing</span></a>
</li>
<li class="topic-ocean">
<a href="/ocean"><i></i><span>Ocean</span></a>
</li>
<li class="topic-states">
<a href="/states"><i></i><span>States</span></a>
</li>
</ul>

<div class="more-link">
<h5>
<a data-toggle="collapse" data-parent="#topic-list" href="#more-topics" class="collapsed">
<span>More Topics</span>
<i></i>
</a>
</h5>
</div>

</div>
</ul>

</div><!--/.container-->

Expand Down
2 changes: 1 addition & 1 deletion roots-nextdatagov/lib/scripts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function roots_scripts() {
wp_enqueue_style('datagov-googlefonts', '//fonts.googleapis.com/css?family=Abel|Lato:100,300,400,700' );
//wp_enqueue_style('fontawesome', '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css');

wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '1427d8a0237d89ec37973b2fe37b4b0d');
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'ef44952cf32e0dbaffe2aed3c22fd607');
wp_enqueue_style('rei_css', get_template_directory_uri() . '/assets/css/rei.css', false, '' );


Expand Down

0 comments on commit a71d5c8

Please sign in to comment.