Commits

salvator committed 85f4a35

style.css -> style.less

  • Participants
  • Parent commits 9c5b054

Comments (0)

Files changed (3)

File admintools_bootstrap/static/admintools_bootstrap/style.css

-.page-top .pull-right {
-	margin-top: -33px;
-}
-
-h1, ul, li {
-	margin: 0;
-}
-
-#changelist-filter {
-	float: right;
-	max-width: 180px;
-}
-
-#changelist-filter li {
-	list-style: none;
-	list-style-position: outside;
-	padding-left: 8px;
-}
-
-#changelist-filter ul {
-	margin-left: -0.5em;
-}
-
-#changelist-filter li.selected {
-	border-left: 4px solid gray;
-	padding-left: 4px;
-}
-
-.content {
-	margin-right: 230px;
-}
-
-#chabgelist-search {
-	margin-left: 2em;
-}
-
-.changelist-action label {
-	display: inline;
-	width: auto;
-}
-
-.changelist-action label,
-.changelist-action select,
-.changelist-action button
-{
-	margin-right: 0.5em;
-}
-
-.changelist-action {
-	margin-top: 0.5em;
-	margin-bottom: 0.8em;
-}
-
-.errorlist li {
-	list-style: none;
-	color: red;
-}
-
-.pagination ul {
-	margin-left: 1em;
-}
-
-.pagination input {
-	margin-left: 1em;
-	height: 35px;
-	padding-left: 2em;
-	padding-right: 2em;
-}
-
-.help_text {
-	font-size: small;
-	color: #999;
-	text-transform: lowercase;
-	margin-top: 0.1em;
-}
-
-.readonly-input {
-	margin-top: 0.6em;
-}
-
-.empty-form {
-	display: none;
-}
-
-.dashboard-module li {
-	list-style: none;
-}
-
-.dashboard-module h2 {
-	font-size: 14pt;
-	padding-top: 0px;
-	padding-bottom: 10px;
-}
-
-#container {
-	padding-top: 50px;
-}
-
-td.action-checkbox {
-	width: 1.5em;
-}
-
-.container-popup {
-	min-width: 700px !important; /* replacing bootstrap's value */
-	padding-top: 10px !important;
-}
-
-#result_list td select {
-}
-
-#result_list {
-	width: 100% !important;
-}
-
-.login .hero-unit {
-	margin-left: 20%;
-	margin-right: 20%;
-	margin-top: 80px;
-	padding-top: 30px;
-	padding-bottom: 10px;
-}
-
-.login .hero-unit h1 {
-	font-size: 26pt;
-	margin-bottom: 20px;
-}
-
-.stacked-inline span.delete {
-	float: right;
-}
-
-.stacked-inline span.delete label {
-	width: 50px;
-	margin-top: 0px;
-	padding-top: 4px;
-}
-
-.stacked-inline span.delete input {
-	margin-top: 5px;
-	float: left;
-}
-
-.inline-addlink {
-	color: #fff !important;
-}

File admintools_bootstrap/static/admintools_bootstrap/style.less

+@import "lib/bootstrap.less";
+
+.page-top .pull-right {
+	margin-top: -33px;
+}
+
+h1, ul, li {
+	margin: 0;
+}
+
+#changelist-filter {
+	float: right;
+	max-width: 180px;
+
+	li {
+		list-style: none;
+		list-style-position: outside;
+		padding-left: 8px;
+	}
+
+	ul {
+		margin-left: -0.5em;
+	}
+
+	li.selected {
+		border-left: 4px solid gray;
+		padding-left: 4px;
+	}
+}
+
+
+.content {
+	margin-right: 230px;
+}
+
+#chabgelist-search {
+	margin-left: 2em;
+}
+
+
+
+.changelist-action {
+	margin-top: 0.5em;
+	margin-bottom: 0.8em;
+
+	label, select, button {
+		margin-right: 0.5em;
+	}
+
+	label {
+		display: inline;
+		width: auto;
+	}
+}
+
+.errorlist li {
+	list-style: none;
+	color: red;
+}
+
+
+.pagination {
+	ul {
+		margin-left: 1em;
+	}
+	input {
+		margin-left: 1em;
+		height: 35px;
+		padding-left: 2em;
+		padding-right: 2em;
+	}
+}
+
+
+.help_text {
+	font-size: small;
+	color: #999;
+	text-transform: lowercase;
+	margin-top: 0.1em;
+}
+
+.readonly-input {
+	margin-top: 0.6em;
+}
+
+.empty-form {
+	display: none;
+}
+
+.dashboard-module {
+	li {
+		list-style: none;
+	}
+
+	h2 {
+		font-size: 14pt;
+		padding-top: 0px;
+		padding-bottom: 10px;
+	}
+}
+
+
+#container {
+	padding-top: 50px;
+}
+
+td.action-checkbox {
+	width: 1.5em;
+}
+
+.container-popup {
+	min-width: 700px !important; /* replacing bootstrap's value */
+	padding-top: 10px !important;
+}
+
+#result_list {
+	width: 100% !important;
+}
+
+.login .hero-unit {
+	margin-left: 20%;
+	margin-right: 20%;
+	margin-top: 80px;
+	padding-top: 30px;
+	padding-bottom: 10px;
+
+	h1 {
+		font-size: 26pt;
+		margin-bottom: 20px;
+	}
+}
+
+
+.stacked-inline span.delete {
+	float: right;
+
+	label {
+		width: 50px;
+		margin-top: 0px;
+		padding-top: 4px;
+	}
+
+	input {
+		margin-top: 5px;
+		float: left;
+	}
+}
+
+
+.inline-addlink {
+	color: #fff !important;
+}

File admintools_bootstrap/templates/admin/base_site.html

 
 {% block extrastyle %}
 {{ block.super }}
-<link rel="stylesheet/less" type="text/css" href="{{ STATIC_URL }}admintools_bootstrap/lib/bootstrap.less" />
+<link rel="stylesheet/less" type="text/css" href="{{ STATIC_URL }}admintools_bootstrap/style.less" />
 <script type="text/javascript" src="{{ STATIC_URL }}admintools_bootstrap/js/less.js"></script>
+
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}admintools_bootstrap/chosen/chosen.css" />
-<link rel="stylesheet" href="{{ STATIC_URL }}admintools_bootstrap/style.css" />
 {% endblock %}
 
 {% block extrahead %}