Skip to content
This repository has been archived by the owner on May 28, 2020. It is now read-only.

Commit

Permalink
Add Organizations page; Style changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchdowney
mitchdowney committed Oct 1, 2014
1 parent 7663578 commit d927b12
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 19 deletions.
2 changes: 1 addition & 1 deletion candidate.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ <h4>Sojourner Truth</h4>
</div>
<hr>
<p class="party"><b>Independent</b></p>
<p class="profile-tagline"><em>“If the first woman God ever made was strong enough to turn the world upside down all alone, these women together ought to be able to turn it back, and get it right side up again!</em></p>
<p class="profile-summary"><em>“If the first woman God ever made was strong enough to turn the world upside down all alone, these women together ought to be able to turn it back, and get it right side up again!</em></p>
</div><!-- /.profile clearfix -->
<p><b>About</b></p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque auctor leo ac volutpat convallis. Integer vel hendrerit ex. Nullam et facilisis nibh, eu lacinia diam. Phasellus eleifend metus ac erat varius, eu varius arcu facilisis. </p>
Expand Down
22 changes: 16 additions & 6 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ ul, ol {
margin-bottom:0;
}

hr {
border-top:1px solid #ddd;
}

.display-none {
display:none;
}
Expand Down Expand Up @@ -508,17 +512,23 @@ ul, ol {
border-right:1px solid #aaa;
}

.groups-search {
.main-sort-by {
margin:0 0 20px 0;
}

.groups-search {
margin:20px 0;
font-family:"Lora", sans-serif;
}

.groups-search input {
display:inline-block;
width:70%;
width:80%;
}

.groups-search-button {
display:inline-block;
vertical-align:top;
}

.profile-folder-bar {
Expand Down Expand Up @@ -579,7 +589,7 @@ ul, ol {
@media (min-width:768px) {
.profile img {
float: left;
margin-right: 10px;
margin-right: 15px;
width: 110px;
}
}
Expand Down Expand Up @@ -710,21 +720,21 @@ ul, ol {
}

@media (max-width:767px) {
.profile-tagline {
.profile-summary {
display:none;
}
}

@media (min-width:768px) and (max-width:991px) {
.profile-tagline {
.profile-summary {
font-size:14px;
margin-bottom:7px !important;
margin-top:7px;
}
}

@media (min-width:992px) {
.profile-tagline {
.profile-summary {
font-size:13px;
margin-bottom:7px !important;
margin-top:7px;
Expand Down
6 changes: 3 additions & 3 deletions css/style_old.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,21 +556,21 @@ ul, ol {
}

@media (max-width:767px) {
.profile-tagline {
.profile-summary {
display:none;
}
}

@media (min-width:768px) and (max-width:991px) {
.profile-tagline {
.profile-summary {
font-size:12px;
margin-bottom:7px !important;
margin-top:7px;
}
}

@media (min-width:992px) {
.profile-tagline {
.profile-summary {
font-size:12px;
margin-bottom:7px !important;
margin-top:7px;
Expand Down
58 changes: 55 additions & 3 deletions groups.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,65 @@ <h1>Fall 2014 Session</h1>
<img src="img/niu.png" class="img-responsive" />
</div>
<div class="main-content">
<h2>Groups</h2>
<div class="groups-search">
<input type="text" class="form-control" placeholder="Type your group name">
<button type="submit" class="btn btn-default groups-search-button"><i class="fa fa-search"></i></button>
</div>
<h2>Groups</h2>
<p>Sort by: <a>next election</a></p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis consectetur lacinia mi, nec tincidunt eros. Aliquam nec sem aliquet, mattis nisi sit amet, fringilla arcu. Aenean egestas risus eu facilisis vulputate. Praesent rutrum mollis nisl, eget tempor turpis interdum ultricies. Cras imperdiet mi ut risus pellentesque porta.... <a href="#">show more</a></p>
<hr>
<p class="main-sort-by">Sort by: <a>next election</a></p>
<div class="profile clearfix">
<img src="img/kevin-hall-monitor.png" />
<h4>Student Association</h4>
<div class="profile-social">
<i class="fa fa-facebook-square"></i>
<i class="fa fa-twitter-square"></i>
<i class="fa fa-linkedin-square"></i>
<i class="fa fa-pinterest-square"></i>
</div>
<hr>
<p class="party"><b>Student Government</b></p>
<p class="profile-summary"><em>Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. </em></p>
</div><!-- /.profile clearfix -->
<div class="profile clearfix">
<img src="img/kevin-hall-monitor.png" />
<h4>Campus Activities Board</h4>
<div class="profile-social">
<i class="fa fa-facebook-square"></i>
<i class="fa fa-twitter-square"></i>
<i class="fa fa-linkedin-square"></i>
<i class="fa fa-pinterest-square"></i>
</div>
<hr>
<p class="party"><b>Entertainment</b></p>
<p class="profile-summary"><em>Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. </em></p>
</div><!-- /.profile clearfix -->
<div class="profile clearfix">
<img src="img/kevin-hall-monitor.png" />
<h4>Black Student Union</h4>
<div class="profile-social">
<i class="fa fa-facebook-square"></i>
<i class="fa fa-twitter-square"></i>
<i class="fa fa-linkedin-square"></i>
<i class="fa fa-pinterest-square"></i>
</div>
<hr>
<p class="party"><b>Student Organization</b></p>
<p class="profile-summary"><em>Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. </em></p>
</div><!-- /.profile clearfix -->
<div class="profile clearfix">
<img src="img/kevin-hall-monitor.png" />
<h4>Homecoming Court</h4>
<div class="profile-social">
<i class="fa fa-facebook-square"></i>
<i class="fa fa-twitter-square"></i>
<i class="fa fa-linkedin-square"></i>
<i class="fa fa-pinterest-square"></i>
</div>
<hr>
<p class="party"><b>Student Organization</b></p>
<p class="profile-summary"><em>Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. Summary of organization. </em></p>
</div><!-- /.profile clearfix -->
</div><!-- /.main-content -->
</div><!-- /.main-border -->
</div><!-- /.col-md-9 -->
Expand Down
Binary file added img/kevin-hall-monitor.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ <h2>Election</h2>
<p>Voting Days: October 23 (9am-5pm), October 24 (7am-7pm), October 25 (9am-5pm)</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis consectetur lacinia mi, nec tincidunt eros. Aliquam nec sem aliquet, mattis nisi sit amet, fringilla arcu. Aenean egestas risus eu facilisis vulputate. Praesent rutrum mollis nisl, eget tempor turpis interdum ultricies. Cras imperdiet mi ut risus pellentesque porta.... <a href="#">show more</a></p>
<h2>Candidates</h2>
<p>Sort by: <a>random</a></p>
<p class="main-sort-by">Sort by: <a>random</a></p>
<div id="folder-1-bar" class="profile-folder-bar">
<h3><i id="folder-1-icon" class="fa fa-caret-right caret-width"></i>Executive Branch <span class="profile-folder-bar-number">14</span></h3>
</div>
Expand All @@ -167,7 +167,7 @@ <h4>Sojourner Truth</h4>
</div>
<hr>
<p class="party"><b>Independent</b></p>
<p class="profile-tagline"><em>“If the first woman God ever made was strong enough to turn the world upside down all alone, these women together ought to be able to turn it back, and get it right side up again!</em></p>
<p class="profile-summary"><em>“If the first woman God ever made was strong enough to turn the world upside down all alone, these women together ought to be able to turn it back, and get it right side up again!</em></p>
</div><!-- /.profile clearfix -->
<div class="profile clearfix">
<img src="img/user.png" />
Expand All @@ -180,7 +180,7 @@ <h4>Frederick Douglass</h4>
</div>
<hr>
<p class="party"><b>Independent</b></p>
<p class="profile-tagline"><em>“The life of the nation is secure only while the nation is honest, truthful, and virtuous.”</em></p>
<p class="profile-summary"><em>“The life of the nation is secure only while the nation is honest, truthful, and virtuous.”</em></p>
</div><!-- /.profile clearfix -->
<div class="profile clearfix">
<img src="img/jane-addams.jpg" />
Expand All @@ -193,7 +193,7 @@ <h4>Jane Addams</h4>
</div>
<hr>
<p class="party"><b>Independent</b></p>
<p class="profile-tagline"><em>“America's future will be determined by the home and the school. The child becomes largely what he is taught; hence we must watch what we teach, and how we live.”</em></p>
<p class="profile-summary"><em>“America's future will be determined by the home and the school. The child becomes largely what he is taught; hence we must watch what we teach, and how we live.”</em></p>
</div><!-- /.profile clearfix -->
<div class="profile clearfix">
<img src="img/thomas-paine.jpg" />
Expand All @@ -206,7 +206,7 @@ <h4>Thomas Paine</h4>
</div>
<hr>
<p class="party"><b>Independent</b></p>
<p class="profile-tagline"><em>“The World is my country, all mankind are my brethren, and to do good is my religion.”</em></p>
<p class="profile-summary"><em>“The World is my country, all mankind are my brethren, and to do good is my religion.”</em></p>
</div><!-- /.profile clearfix -->
</div><!-- /.profile-folder -->
</div><!-- /.profile-folder -->
Expand Down
2 changes: 1 addition & 1 deletion views/index.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<h4>Frederick Douglass</h4>
<hr>
<p><b>Independent</b></p>
<p class="profile-tagline"><em>“Without a struggle, there can be no progress. Without a struggle, there can be no progress.”</em></p>
<p class="profile-summary"><em>“Without a struggle, there can be no progress. Without a struggle, there can be no progress.”</em></p>
<div class="profile-social">
<i class="fa fa-facebook-square"></i>
<i class="fa fa-twitter-square"></i>
Expand Down

0 comments on commit d927b12

Please sign in to comment.