diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-14 21:06:37 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-14 21:06:37 +0200 |
| commit | df6487b2f82b275e9b0c9f0aad0f8618dc1135eb (patch) | |
| tree | bc48dfd42fa5b6e545a017dbd40eb67dbe57f2d1 | |
| parent | 3d04a9ae9c1d811b9e2204d7651e948c6641e1fb (diff) | |
add conditional style include for 7
| -rw-r--r-- | css/7.css | 3 | ||||
| -rw-r--r-- | js/build/app.js | 6 | ||||
| -rw-r--r-- | js/gui/KeyboardShortcuts.js | 6 | ||||
| -rw-r--r-- | templates/index.php | 6 |
4 files changed, 17 insertions, 4 deletions
diff --git a/css/7.css b/css/7.css new file mode 100644 index 000000000..5e631c417 --- /dev/null +++ b/css/7.css @@ -0,0 +1,3 @@ +/** + * Backported styles for ownCloud 7 + */
\ No newline at end of file diff --git a/js/build/app.js b/js/build/app.js index 8198cd7d5..5bd667027 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -1667,7 +1667,8 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL) var elements = navigationArea.find('.subscriptions:visible,' + '.starred:visible,' + '.feed:visible'); - + // FIXME: O(n) runtime. If someone creates a nice and not fugly solution + // please create a PR for (var i=0; i<elements.length-1; i+=1) { var element = elements[i]; @@ -1684,7 +1685,8 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL) var elements = navigationArea.find('.subscriptions:visible,' + '.starred:visible,' + '.feed:visible'); - + // FIXME: O(n) runtime. If someone creates a nice and not fugly solution + // please create a PR for (var i=elements.length-1; i>0; i-=1) { var element = elements[i]; diff --git a/js/gui/KeyboardShortcuts.js b/js/gui/KeyboardShortcuts.js index 6c17f54e0..d9074fdcc 100644 --- a/js/gui/KeyboardShortcuts.js +++ b/js/gui/KeyboardShortcuts.js @@ -43,7 +43,8 @@ var elements = navigationArea.find('.subscriptions:visible,' + '.starred:visible,' + '.feed:visible'); - + // FIXME: O(n) runtime. If someone creates a nice and not fugly solution + // please create a PR for (var i=0; i<elements.length-1; i+=1) { var element = elements[i]; @@ -60,7 +61,8 @@ var elements = navigationArea.find('.subscriptions:visible,' + '.starred:visible,' + '.feed:visible'); - + // FIXME: O(n) runtime. If someone creates a nice and not fugly solution + // please create a PR for (var i=elements.length-1; i>0; i-=1) { var element = elements[i]; diff --git a/templates/index.php b/templates/index.php index eca1ed0e7..c1cbd8d59 100644 --- a/templates/index.php +++ b/templates/index.php @@ -15,6 +15,12 @@ style('news', [ 'settings', 'custom' ]); + +// owncloud 7 backported style sheets +$version = \OCP\Util::getVersion(); +if($version[0] > 7 && $version[1] <= 8) { + style('news', '7'); +} ?> |