Skip to content

Commit

Permalink
Revert layout.css changes; some styles apparently WERE still used.
Browse files Browse the repository at this point in the history
  • Loading branch information
ptrourke committed Nov 12, 2014
1 parent 7c4f685 commit 67accf5
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 1 deletion.
119 changes: 119 additions & 0 deletions viewshare/apps/exhibit/static/freemix/css/layout.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,122 @@
/**
* TODO: PyCharm is not finding all uses of layout.css styles.
*
*/


/**
* From http://matthewjamestaylor.com/blog/perfect-3-column.htm
* and accompanying other layouts. Parts irrelevant to layout
* excised, some clear: attributes removed to better fit with
* embedding.
*/



.colhead {
float: left;
width: 98%;
padding: 0.25em 1%;
}

.colmask {
position: relative;
float: left;
width: 100%;
overflow: hidden;
}
/* common column settings */

.colright,
.colmid,
.colleft {
float: left;
width: 100%;
position: relative;
}

.col1,
.col2,
.col3 {
float: left;
position: relative;
padding: 0 0 1em 0;
}
/* Three-column settings */
.threecol .colmid {
right: 25%;
}

.threecol .colleft {
right: 50%;
}

.threecol .col1 {
width: 46%;
left: 102%;
}

.threecol .col2 {
width: 21%;
left: 31%;
}

.threecol .col3 {
width: 21%;
left: 85%;
}
/* Two-column right focus */
.leftmenu .colleft {
right: 75%;
}

.leftmenu .col1 {
left: 102%;
width: 71%;
}

.leftmenu .col2 {
left: 6%;
width: 21%;
}
/* Two-column left focus */
.rightmenu .colleft {
right: 25%;
}

.rightmenu .col1 {
left: 27%;
width: 71%;
}

.rightmenu .col2 {
left: 31%;
width: 21%;
}
/* Two equal columns */
.doublepage .colleft {
right: 50%;
}

.doublepage .col1 {
left: 52%;
width: 46%;
}

.doublepage .col2 {
left: 56%;
width: 46%;
}
/* One-column */
.fullpage .col1 {
left: 2%;
width: 96%;
}





/*!
* Bootstrap Responsive v2.3.2
*
Expand Down
2 changes: 1 addition & 1 deletion viewshare/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
urlpatterns += patterns('',


#Old help page URLs. OK to use optional trailing slash on redirects; avoid it on template views.
#Old help page URLs. OK to use optional trailing slash on redirects; avoid it on template views.

url(r'^import/?$',
RedirectView.as_view(url="http://viewshare.uservoice.com/knowledgebase/articles/243875-importing-data-into-viewshare"),
Expand Down

0 comments on commit 67accf5

Please sign in to comment.