allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/3] allura git commit: [#8093] stub out responsive theme that inherits everything but adds Foundation
Date Tue, 23 Oct 2018 19:34:15 GMT
Repository: allura
Updated Branches:
  refs/heads/db/8093 [created] bae13c1bb


[#8093] stub out responsive theme that inherits everything but adds Foundation


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/bae13c1b
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/bae13c1b
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/bae13c1b

Branch: refs/heads/db/8093
Commit: bae13c1bb76704d01766e13c218a0bbc6473aa45
Parents: d556442
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Tue Oct 23 19:10:12 2018 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Tue Oct 23 19:32:07 2018 +0000

----------------------------------------------------------------------
 Allura/allura/lib/plugin.py                  | 6 ++++++
 Allura/allura/nf/responsive/scss/styles.scss | 8 ++++++++
 Allura/development.ini                       | 2 ++
 Allura/setup.py                              | 7 ++++---
 4 files changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/bae13c1b/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index ee2cfe7..9955e21 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -1398,6 +1398,12 @@ class ThemeProvider(object):
         return False
 
 
+class ResponsiveTheme(ThemeProvider):
+    def require(self):
+        g.register_theme_css('../allura/css/site_style.css', compress=False)  # temporarily
include original theme too
+        g.register_theme_css('css/styles.css', compress=False)
+
+
 class LocalProjectRegistrationProvider(ProjectRegistrationProvider):
     pass
 

http://git-wip-us.apache.org/repos/asf/allura/blob/bae13c1b/Allura/allura/nf/responsive/scss/styles.scss
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/responsive/scss/styles.scss b/Allura/allura/nf/responsive/scss/styles.scss
index 3d30930..8e203ed 100644
--- a/Allura/allura/nf/responsive/scss/styles.scss
+++ b/Allura/allura/nf/responsive/scss/styles.scss
@@ -23,6 +23,14 @@
 @import 'foundation';
 // @import 'motion-ui';
 
+
+
+/*
+NOTE: this includes pretty much everything initially
+      it will probably have some CSS rule conflicts
+      we will soon need to limit this to just the files we want */
+
+
 @include foundation-global-styles;
 // @include foundation-grid;
 @include foundation-flex-grid;

http://git-wip-us.apache.org/repos/asf/allura/blob/bae13c1b/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 9d00055..7d32dbc 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -128,6 +128,8 @@ global_nav = [{"title": "Site Home", "url": "/"}]
 ; Project registration system.  Only local is available, unless you write a custom one for
custom integration.
 registration.method = local
 theme = allura
+; The responsive theme is a work in progress.  See also "disable_entry_points.allura.theme.override
= responsive" in this file
+;theme = responsive
 
 ; These are the sizes of project icons that may be requested.  They will be saved to the
database.
 ; If your theme is going to support other sizes, update this list.

http://git-wip-us.apache.org/repos/asf/allura/blob/bae13c1b/Allura/setup.py
----------------------------------------------------------------------
diff --git a/Allura/setup.py b/Allura/setup.py
index 9d92f3e..4de3c6b 100644
--- a/Allura/setup.py
+++ b/Allura/setup.py
@@ -102,6 +102,10 @@ setup(
 
     [allura.theme]
     allura = allura.lib.plugin:ThemeProvider
+    responsive = allura.lib.plugin:ResponsiveTheme
+
+    [allura.theme.override]
+    responsive = allura.templates_responsive.responsive_overrides:ResponsiveOverrides
 
     [allura.spam]
     akismet = allura.lib.spam.akismetfilter:AkismetSpamFilter
@@ -155,9 +159,6 @@ setup(
     set-neighborhood-features = allura.command:SetNeighborhoodFeaturesCommand
     reclone-repo = allura.command.reclone_repo:RecloneRepoCommand
 
-    [allura.theme.override]
-    responsive = allura.templates_responsive.responsive_overrides:ResponsiveOverrides
-
     [easy_widgets.resources]
     ew_resources=allura.config.resources:register_ew_resources
 


Mime
View raw message