Skip to content
Snippets Groups Projects
Commit 784fccf1 authored by Ian Hallworth's avatar Ian Hallworth
Browse files

wip

parent 03e9fd9b
No related branches found
No related tags found
3 merge requests!199Staging,!192Sudan fixtures,!191Css upgrade
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 215 deletions
.gitignore
+ 1
− 0
View file @ 784fccf1
......@@ -4,6 +4,7 @@
.idea
.pytest_cache
internewshid/local_settings.py
internewshid/local_settings.py.ian
internewshid/private_settings.py
internewshid/.ve
internewshid/distribute-*.tar.gz
......
internewshid/hid/templates/hid/upload_form.html
+ 2
− 2
View file @ 784fccf1
......@@ -4,11 +4,11 @@
<form action="{% url "sources-upload" %}"
method="post"
enctype="multipart/form-data"
class="auto-upload-file nav navbar-form navbar-left text-center">
class="auto-upload-file nav navbar-form">
{% csrf_token %}
{% bootstrap_form upload_form show_label=False %}
<li>
<a class="btn upload-button pull-left" type="button" value="Upload" href="{% url "tabbed-page" name="main" tab_name="all" %}">
<a class="btn upload-button pull-left btn-block" type="button" value="Upload" href="{% url "tabbed-page" name="main" tab_name="all" %}">
<span class="fa fa-upload fa-fw"></span>
{% blocktrans %}Upload{% endblocktrans %}
</a>
......
internewshid/media/bootstrap/less/bootstrap.less
+ 17
− 17
View file @ 784fccf1
......@@ -11,45 +11,45 @@
// Reset and dependencies
@import "normalize.less";
@import "print.less";
@import "glyphicons.less";
// @import "glyphicons.less";
// Core CSS
@import "scaffolding.less";
@import "type.less";
@import "code.less";
// @import "code.less";
@import "grid.less";
@import "tables.less";
@import "forms.less";
@import "buttons.less";
// Components
@import "component-animations.less";
// @import "component-animations.less";
@import "dropdowns.less";
@import "button-groups.less";
@import "input-groups.less";
// @import "button-groups.less";
// @import "input-groups.less";
@import "navs.less";
@import "navbar.less";
@import "breadcrumbs.less";
// @import "breadcrumbs.less";
@import "pagination.less";
@import "pager.less";
// @import "pager.less";
@import "labels.less";
@import "badges.less";
@import "jumbotron.less";
@import "thumbnails.less";
// @import "badges.less";
// @import "jumbotron.less";
// @import "thumbnails.less";
@import "alerts.less";
@import "progress-bars.less";
@import "media.less";
@import "list-group.less";
// @import "progress-bars.less";
// @import "media.less";
// @import "list-group.less";
@import "panels.less";
@import "responsive-embed.less";
@import "wells.less";
// @import "wells.less";
@import "close.less";
// Components w/ JavaScript
@import "modals.less";
@import "tooltip.less";
// @import "modals.less";
// @import "tooltip.less";
@import "popovers.less";
@import "carousel.less";
// @import "carousel.less";
// Utility classes
@import "utilities.less";
......
internewshid/media/less/internews-bootstrap.less
+ 0
− 2
View file @ 784fccf1
// Import core variables and internews specific styles
@import "../bootstrap/less/bootstrap.less";
@import "../bootstrap/less/mixins.less";
@import "../bootstrap/less/utilities.less";
@import "bootstrap-multiselect.less";
@import "bootstrap-tagsinput.less";
@import "internews-variables.less";
......
internewshid/media/less/internews-cosmo.less
+ 3
− 2
View file @ 784fccf1
// Cosmo 3.3.5
// Bootswatch
// FILE NO LONGER IMPORTED
// -----------------------------------------------------
@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700");
......@@ -232,7 +233,7 @@ a.list-group-item {
&.active {
background-color: @state-warning-bg;
}
&.active:hover,
&.active:focus {
background-color: darken(@state-warning-bg, 5%);
......@@ -243,7 +244,7 @@ a.list-group-item {
&.active {
background-color: @state-danger-bg;
}
&.active:hover,
&.active:focus {
background-color: darken(@state-danger-bg, 5%);
......
internewshid/media/less/internews-variables.less
+ 2
− 1
View file @ 784fccf1
......@@ -376,7 +376,7 @@
// Navbar links
@navbar-default-link-color: @gray-dark;
@navbar-default-link-hover-color: @brand-secondary;
@navbar-default-link-hover-bg: darken(@navbar-default-bg, 10%);
@navbar-default-link-hover-bg: fade(@brand-primary, 20%);
@navbar-default-link-active-color: @navbar-default-link-hover-color;
@navbar-default-link-active-bg: @navbar-default-link-hover-bg;
@navbar-default-link-disabled-color: #ccc;
......@@ -651,6 +651,7 @@
//
//##
//** Background color of the whole progress component
@progress-bg: #ccc;
//** Progress bar text color
......
internewshid/media/less/internews.less
+ 39
− 191
View file @ 784fccf1
......@@ -51,11 +51,11 @@ body {
background-color:@body-bg;
border-bottom:1px solid @gray;
}
// Branding
ul.nav.nav-pills:after{
clear: none;
}
// Navs ===============================================================
.navbar-brand {
padding-top:@padding-small-vertical * 3;
background: url(../images/internews-logo.svg) no-repeat transparent;
background-size: contain;
font-weight: bold;
......@@ -64,60 +64,27 @@ ul.nav.nav-pills:after{
min-width: 150px;
margin-right: 2em;
color: @brand-secondary;
// Deployment name
span {
display: inline-block;
width: 183px;
margin-left: 23%;
margin-top: 12%;
display: inline-block;
width: 183px;
margin-left: 23%;
margin-top: 12%;
// Deployment Location
span{
color: @brand-primary;
margin: 0;
}
}
}
@media(min-width:@screen-sm-min){
.navbar-brand {
padding-top:@padding-small-vertical * 3;
}
}
// Navs =======================================================================
// Search form
.navbar-form{
.form-control{
border-radius: 8px;
}
button[type="submit"]{
display: none;
}
}
// Utilities list
.nav-utilities{
font-size: @font-size-medium;
}
.dropdown-menu {
z-index: @zindex-upload-dropdown;
& > li > a:hover,
& > li > a:focus {
background-image: none;
}
}
// Pills
// Dashboard / Feedback Pills
// -------------------------
.nav-pills {
> li {
font-weight: bold;
float: left;
// Links rendered as pills
> a {
border-radius: @border-radius-small;
......@@ -145,113 +112,49 @@ ul.nav.nav-pills:after{
}
}
}
}
// Secondary header nav
.last-uploaded{
font-size: small;
line-height: 1;
color: @brand-primary;
span{
color: @brand-secondary;
}
}
.navbar-static-top {
position:absolute;
width:100%;
.box-shadow(0 1px 4px rgba(0, 0, 0, 0.3));
border:none;
top:0;
z-index:@zindex-navbar-fixed;
}
@media(min-width:@screen-sm-min) {
.navbar-static-top {
position:fixed;
top:0;
}
}
.navbar-top-links {
margin-right: 0;
}
.navbar-top-links li {
display: inline-block;
}
@media(min-width:@screen-sm-min){
.navbar-top-links li:last-child {
margin-right: 15px;
&:after{
clear: none;
}
}
.navbar-top-links li a {
padding: 15px;
min-height: 50px;
}
@media(max-width:@screen-sm){
.navbar-top-links li a {
padding:5px 10px;
min-height:10px;
margin:5px 10px;
}
}
// Utilities Upload/Export/Settings
.nav-utilities{
font-size: @font-size-medium;
.navbar-top-links > li > a,
.navbar-top-links > li > a > .fa {
color:@gray-dark;
}
.dropdown-menu {
z-index: @zindex-upload-dropdown;
.navbar-top-links .dropdown-menu li {
display: block;
padding:0 @padding-small-horizontal 0 ;
& > li > a:hover,
& > li > a:focus {
background-image: none;
}
}
}
.navbar-top-links .dropdown-menu li:last-child {
margin-right: 0;
}
.navbar-top-links .dropdown-menu li a {
padding: @nav-link-padding;
min-height: 0;
}
.navbar-top-links .dropdown-menu li a div {
white-space: normal;
// Search form
.navbar-form{
.form-control{
border-radius: 8px;
}
button[type="submit"]{
display: none;
}
}
.navbar-top-links .dropdown-messages,
.navbar-top-links .dropdown-tasks,
.navbar-top-links .dropdown-alerts {
width: 310px;
min-width: 0;
}
.navbar-top-links .dropdown-messages {
margin-left: 5px;
}
.navbar-top-links .dropdown-tasks {
margin-left: -59px;
// Secondary header nav
.last-uploaded{
font-size: small;
line-height: 1;
color: @brand-primary;
span{
color: @brand-secondary;
}
}
.navbar-top-links .dropdown-alerts {
margin-left: -123px;
}
.navbar-top-links .dropdown-user {
right: 0;
left: auto;
margin:0;
}
.navbar-top-links > li > a:hover,
.navbar-top-links > .open > a:focus {
background-color:@brand-secondary;
}
// --Sidebar
......@@ -286,61 +189,6 @@ ul.nav.nav-pills:after{
overflow-y:inherit;
}
.sidebar .sidebar-search {
padding: 15px;
}
.sidebar .arrow {
float: right;
}
.sidebar .fa.arrow:before {
content: "\f104";
}
.sidebar .active > a > .fa.arrow:before {
content: "\f107";
}
.sidebar .nav-second-level li,
.sidebar .nav-third-level li {
border-bottom: none !important;
}
.sidebar .nav-second-level li a {
padding-left: 37px;
}
.sidebar .nav-third-level li a {
padding-left: 52px;
}
@media(min-width:@screen-sm-min) {
.sidebar {
z-index: @zindex-navbar;
position: fixed;
width: 250px;
}
.navbar-top-links .dropdown-messages,
.navbar-top-links .dropdown-tasks,
.navbar-top-links .dropdown-alerts {
margin-left: auto;
}
}
@media(max-width:@screen-xs) {
.sidebar {
margin-top:96px;
}
}
@media(min-width:@screen-xs-min) and (max-width:@screen-sm) {
.sidebar {
margin-top:76px;
}
}
// --Nav Tabs next to page header
.nav.nav-tabs.navbar-right {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Webarchitects | Forum | Status | SSH Fingerprints