From 24bafbec1f65484530d1324deeaa73de7c3b881a Mon Sep 17 00:00:00 2001 From: Markus Bertheau Date: Wed, 26 Nov 2014 16:00:57 +0100 Subject: [PATCH] UNCLEAR rename --- Makefile | 2 +- ...ve-767px-max.less => responsive-767px-max-bootstrap2.less} | 0 .../less/{responsive.less => responsive-bootstrap2.less} | 2 +- oscar/templates/oscar/dashboard/layout.html | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename oscar/static/oscar/less/page/{responsive-767px-max.less => responsive-767px-max-bootstrap2.less} (100%) rename oscar/static/oscar/less/{responsive.less => responsive-bootstrap2.less} (96%) diff --git a/Makefile b/Makefile index 6c3c9ea8163..adcb6879614 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ compiledmessages: css: # Compile CSS files from LESS lessc --source-map --source-map-less-inline oscar/static/oscar/less/styles.less oscar/static/oscar/css/styles.css - lessc --source-map --source-map-less-inline oscar/static/oscar/less/responsive.less oscar/static/oscar/css/responsive.css + lessc --source-map --source-map-less-inline oscar/static/oscar/less/responsive-bootstrap2.less oscar/static/oscar/css/responsive.css lessc --source-map --source-map-less-inline oscar/static/oscar/less/dashboard.less oscar/static/oscar/css/dashboard.css # Compile CSS for demo site lessc --source-map --source-map-less-inline sites/demo/static/demo/less/styles.less sites/demo/static/demo/css/styles.css diff --git a/oscar/static/oscar/less/page/responsive-767px-max.less b/oscar/static/oscar/less/page/responsive-767px-max-bootstrap2.less similarity index 100% rename from oscar/static/oscar/less/page/responsive-767px-max.less rename to oscar/static/oscar/less/page/responsive-767px-max-bootstrap2.less diff --git a/oscar/static/oscar/less/responsive.less b/oscar/static/oscar/less/responsive-bootstrap2.less similarity index 96% rename from oscar/static/oscar/less/responsive.less rename to oscar/static/oscar/less/responsive-bootstrap2.less index 02d721d2ba9..a1379b6aa0c 100644 --- a/oscar/static/oscar/less/responsive.less +++ b/oscar/static/oscar/less/responsive-bootstrap2.less @@ -55,4 +55,4 @@ // OSCAR SPECIFIC MEDIA QUERIES // ------------------------- -@import "page/responsive-767px-max.less"; +@import "page/responsive-767px-max-bootstrap2.less"; diff --git a/oscar/templates/oscar/dashboard/layout.html b/oscar/templates/oscar/dashboard/layout.html index f90a13de78b..c48e33de16d 100644 --- a/oscar/templates/oscar/dashboard/layout.html +++ b/oscar/templates/oscar/dashboard/layout.html @@ -11,10 +11,10 @@ {% if use_less %} - + {% else %} - + {% endif %} {% endcompress %} {% endblock %}