wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
48477 commits 157 branches 562 tags 714 MiB
Commit graph

616 commits

Author SHA1 Message Date
Morris Jobke
3ced2c7ab2
Merge pull request #8601 from nextcloud/theming-fix-background-color 
Remove too restrict check for background image/color
 2018-03-05 11:28:41 +01:00
Nextcloud bot
6975cef00b
[tx-robot] updated from transifex 2018-03-04 01:12:42 +00:00
Christian Oliff
d838789259
Use correct input type for the url entry 
Change `type="text"` to `type="url"`
 2018-03-02 16:49:56 +09:00
Nextcloud bot
777313db42
[tx-robot] updated from transifex 2018-03-02 01:12:16 +00:00
Julius Härtl
c521791653
Remove to restrict check for background image/color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-01 14:39:31 +01:00
Nextcloud bot
a7fb9ff8da
[tx-robot] updated from transifex 2018-03-01 01:12:11 +00:00
Nextcloud bot
533e8351ad
[tx-robot] updated from transifex 2018-02-28 01:12:31 +00:00
Sagorika Das
7394e8ae58
Empty name not allowed 
Do not allow empty name in theming app.

Signed-off-by: Sagorika Das <sagorika1996@gmail.com>
 2018-02-27 10:54:21 +01:00
Morris Jobke
4076c09195
Merge pull request #8463 from kyrofa/bugfix/8462/theming_app_outside_root 
theming: handle not being in the serverroot
 2018-02-26 18:27:54 +01:00
Kyle Fazzari
8dcbea124e
Remove null check 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-25 07:08:59 -08:00
Kyle Fazzari
25c89a6feb
Add mock to setup 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-24 08:16:42 -08:00
Nextcloud bot
68187e6036
[tx-robot] updated from transifex 2018-02-23 01:12:16 +00:00
Kyle Fazzari
a1f1824116
theming: handle not being in the serverroot 
Currently, the theming app assumes it's in the serverroot. However, with
Nextcloud's flexibility regarding configurable app paths, this is not a
safe assumption to make. If it happens to be an incorrect assumption,
the theming app fails to work.

Instead of relying on the serverroot, just use the path from the
AppManager and utilize relative paths for assets from there.

Fix #8462

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-20 22:45:10 -08:00
Nextcloud bot
b3ca73dc27
[tx-robot] updated from transifex 2018-02-19 01:11:54 +00:00
Nextcloud bot
d953db8683
[tx-robot] updated from transifex 2018-02-17 01:12:04 +00:00
Joas Schilling
f095001e4b
Fix info.xml files of shipped apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:24:03 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Nextcloud bot
3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot
71382daf67
[tx-robot] updated from transifex 2018-02-08 01:10:28 +00:00
Morris Jobke
0225ea1b9a
Merge pull request #8155 from nextcloud/use-guest-css 
Fix styling issues of guest pages
 2018-02-05 12:14:09 +01:00
Roeland Jago Douma
0bde91600a
Fix theming test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-02 21:26:33 +01:00
Julius Härtl
1ac352de6c
Add space on guest pages with custom logo 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-02 14:20:13 +01:00
Julius Härtl
39461a2e09
Make sure theming logo css only applies when a logo is set 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-02 14:20:12 +01:00
Nextcloud bot
b78da27d0a
[tx-robot] updated from transifex 2018-02-01 18:28:02 +00:00
Morris Jobke
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss 
SCSS hardening
 2018-01-29 16:12:10 +01:00
Julius Härtl
5dbf733395
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 20:13:28 +01:00
Julius Härtl
6770213649
Do not rewrite absolute URLs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:08:45 +01:00
Julius Härtl
60e601f4ab
Only override image styles if the theming values are set 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:05:10 +01:00
Julius Härtl
5e325730d6
Remove theming migration 
Those images are alredy migrated after the instance has been updated to NC12

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 15:10:22 +01:00
Joas Schilling
870023365c
Fix "Undefined method setExpectedException()" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 18:10:16 +01:00
Julius Härtl
422e20569b
Theming: adjust background image resizing 
Support high resolution login images by resizing only images that are wider than 4096px

fixes #7459

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-19 13:34:43 +01:00
Nextcloud bot
0f729e2cd3
[tx-robot] updated from transifex 2018-01-15 01:10:43 +00:00
Roeland Jago Douma
db411f8771
Bump apps 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 11:40:53 +01:00
Julius Härtl
d4e106f2b3
More detailed theming capabilities 
This will allow clients to easily check if a custom background is used

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-10 13:23:22 +01:00
Julius Härtl
927626cbaa
Fix appmenu svg double invert 
This fixes a regression caused by 9b668d0, where the css filters to
preview color inversion of the app menu was applied by default. This
commit makes the css filters sensitive on what the current state of the
app menu is.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-10 09:11:32 +01:00
Morris Jobke
8257689e35
Merge pull request #7705 from nextcloud/theming-calc-adjust 
Adjust theming color calculations using sRGB luma
 2018-01-09 23:04:30 +01:00
Julius Härtl
3379290a73
Fix SCSS processing when undoing theming values 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-09 14:18:03 +01:00
Julius Härtl
9bb0299c98
Add colors to tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-08 16:50:03 +01:00
Julius Härtl
9b668d01f5
Fix preview when theming changes invertion of icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-08 10:32:25 +01:00
Julius Härtl
e4f9c75a05
Adjust theming color calculations using sRGB luma 
based on https://robots.thoughtbot.com/closer-look-color-lightness

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-08 10:31:34 +01:00
Julius Härtl
24233162a0
Fix faulty path in theming scss generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-05 09:43:09 +01:00
Nextcloud bot
298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
Julius Härtl
63b4d7e183
Remove css invert since we are using svg filters for now 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-03 14:42:08 +01:00
Roeland Jago Douma
094d41937a
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-18 21:06:52 +01:00
Morris Jobke
d2d73f1ce8
Also replace all other occurences 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 20:57:11 +01:00
Morris Jobke
7c39711798
Merge pull request #7427 from nextcloud/fix-white-color-in-emails 
Fix email buttons for white theme
 2017-12-11 15:16:28 +01:00
Morris Jobke
cce4c285db
Fix email buttons for white theme 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 14:33:54 +01:00
Abijeet
81f34e224c
Allows adding of hex color to the theme-color 
Fixes #7158. Adds a # on the color if missing.

Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event.

Since the input element now allows a hex code, changed values to hexcode.

In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison.

Also changed the way we were determining whether the jscolor component had loaded.

Changed the control to use data-jscolor rather than defining opts in the class.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2017-12-08 10:42:41 +01:00
Nextcloud bot
7d529c081a
[tx-robot] updated from transifex 2017-12-07 01:10:37 +00:00
Nextcloud bot
567757c793
[tx-robot] updated from transifex 2017-12-04 01:10:30 +00:00
Nextcloud bot
ffc627e18e
[tx-robot] updated from transifex 2017-12-01 01:10:20 +00:00
Nextcloud bot
49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
Nextcloud bot
96b15cec83
[tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
Nextcloud bot
dd5373795f
[tx-robot] updated from transifex 2017-11-19 01:09:52 +00:00
Nextcloud bot
b2e9cb6a00
[tx-robot] updated from transifex 2017-11-16 01:09:50 +00:00
Nextcloud bot
c5afb25714
[tx-robot] updated from transifex 2017-11-15 01:09:47 +00:00
Nextcloud bot
28e8a1c4b0
[tx-robot] updated from transifex 2017-11-14 01:09:46 +00:00
Julius Härtl
7a812aa0e1
Theming: bump version to retrigger icon generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-11-13 10:18:48 +01:00
Julius Härtl
d70e9059a5
Theming: Fix tests for favicon containing multiple sizes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-11-13 10:18:48 +01:00
Julius Härtl
31b9fc9eac
Theming: Generate favicon sizes to avoid resizing issues done by the browser 
fixes #5193

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-11-13 10:18:47 +01:00
Nextcloud bot
8e3861563b
[tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Nextcloud bot
ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Morris Jobke
c7e5bc0f9a
Merge pull request #7112 from nextcloud/theming-imagemagick-hint 
Theming: add hint about favicon generation
 2017-11-09 12:16:55 +01:00
Morris Jobke
479966dce8
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-09 10:03:31 +01:00
Julius Härtl
b1b8c99193
Theming: add hint about favicon generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-11-08 23:31:18 +01:00
Lukas Reschke
8c915baa34
Merge pull request #6788 from staabm/master 
Prevent XSS in links which open a new browser window
 2017-11-08 18:55:35 +01:00
Julius Härtl
00956c00b2
Theming: expose element color though capabilities API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-11-07 12:31:23 +01:00
Nextcloud bot
f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Nextcloud bot
7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Nextcloud bot
cc83052ca7
[tx-robot] updated from transifex 2017-11-01 01:08:44 +00:00
Nextcloud bot
299ef9aa78
[tx-robot] updated from transifex 2017-10-31 01:08:31 +00:00
Nextcloud bot
65621141fd
[tx-robot] updated from transifex 2017-10-27 00:08:29 +00:00
Nextcloud bot
37bedbc10d
[tx-robot] updated from transifex 2017-10-26 00:08:39 +00:00
Nextcloud bot
c85deacddb
[tx-robot] updated from transifex 2017-10-25 00:08:45 +00:00
Morris Jobke
43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +02:00
Nextcloud bot
1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Nextcloud bot
3709d3eeae
[tx-robot] updated from transifex 2017-10-21 00:08:26 +00:00
Markus Staab
db34b59238 Prevent XSS in links which open a new browser window 2017-10-19 12:16:04 +02:00
Nextcloud bot
8e884ba52f
[tx-robot] updated from transifex 2017-10-18 00:08:23 +00:00
Nextcloud bot
59c3ea91fd
[tx-robot] updated from transifex 2017-10-17 00:08:23 +00:00
Roeland Jago Douma
1b2568e637 Merge pull request #6585 from nextcloud/theming-fileupload-errorhandling 
Theming: Handle errors on uploaded files properly
 2017-10-15 21:44:48 +02:00
Nextcloud bot
61077df79a
[tx-robot] updated from transifex 2017-10-08 00:08:22 +00:00
Julius Härtl
f15e85c4f5
Theming: Add tests for mimetype and upload error checks 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-03 15:34:44 +02:00
Julius Härtl
9651c1abff
Theming: Fix message/loading display on errors 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-03 15:32:50 +02:00
Julius Härtl
c0d104087b
Theming: Check valid image format also for logo 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-03 15:32:50 +02:00
Julius Härtl
c337c8fa45
Theming: Handle errors on uploaded files properly 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-03 15:32:50 +02:00
Nextcloud bot
8be053516b
[tx-robot] updated from transifex 2017-09-30 00:08:25 +00:00
Nextcloud bot
95ec247d10
[tx-robot] updated from transifex 2017-09-29 00:08:21 +00:00
Nextcloud bot
de2dc3c919
[tx-robot] updated from transifex 2017-09-27 00:08:23 +00:00
Nextcloud bot
887229b7b8
[tx-robot] updated from transifex 2017-09-22 00:08:22 +00:00
Nextcloud bot
d603d78630
[tx-robot] updated from transifex 2017-09-19 00:08:27 +00:00
Nextcloud bot
60e0de4a36
[tx-robot] updated from transifex 2017-09-18 00:08:32 +00:00
Morris Jobke
d659199ff5 Merge pull request #5398 from nextcloud/theming-page-title 
Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
 2017-09-13 13:08:37 +02:00
Joachim Bauch
91598cbfb5
Use theme methods "getTitle" and "getEntity" as fallback if name is not themed. 
This fixes an issue with custom filesystem themes that can define title, name
and entity differently, but the theming app was only using the name as fallback
(see #5374).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
 2017-09-13 11:02:45 +02:00
Morris Jobke
241579587a Merge pull request #6457 from nextcloud/theming-favicon-invert-apps 
Invert themed favicons on bright colors
 2017-09-13 10:48:33 +02:00
Morris Jobke
83508d7be3 Merge pull request #6451 from nextcloud/theming-manifest-json 
Theming app support for chrome manifest.json file
 2017-09-12 15:10:08 +02:00
Julius Härtl
9a47b25f19
Theming: Invert app icon in favicon for bright backgrounds 
fixes #5650

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 11:37:25 +02:00
Julius Härtl
1f8a3e05c1
Theming: Use png32 for generated icons 
fixes #4796

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 11:34:21 +02:00
Julius Härtl
81ef116bfb
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:47:38 +02:00
Julius Härtl
8391ca8792
Use IAppManager instead of private API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:28:22 +02:00
Julius Härtl
770aae42f6
Add themed manifest.json to theming app 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 09:23:12 +02:00
Julius Härtl
b49ab065b7
Move theming related imagePath logic to ThemingDefaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 09:22:57 +02:00
Nextcloud bot
c124a43d74
[tx-robot] updated from transifex 2017-09-12 00:08:25 +00:00
Nextcloud bot
3f6692ee24
[tx-robot] updated from transifex 2017-09-10 00:08:23 +00:00
Nextcloud bot
9959560649
[tx-robot] updated from transifex 2017-09-07 00:08:23 +00:00
Morris Jobke
f5aea79bd7
Fix layout of alternative login buttons 
* fixes #6367

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-06 10:21:11 +02:00
Julius Härtl
63d1da50b4
Cleanup theming styles to fit the new login page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:31:57 +02:00
Julius Härtl
8f10cee3ff
Fix tests for primary element color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Julius Härtl
da5662c454
Use separate element color in theming 
This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Julius Härtl
0a49757535
Change invertion threshold to 55% 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-02 21:48:14 +02:00
Jan-Christoph Borchardt
2e6d1a3453 Set primary action button color to same as theming color 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:05:18 +02:00
Jan-Christoph Borchardt
badbab81ea Update background image to the one used on the website 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:04:11 +02:00
Nextcloud bot
6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Nextcloud bot
d7406e5159
[tx-robot] updated from transifex 2017-08-16 00:08:33 +00:00
Morris Jobke
8c97218b95 Merge pull request #6128 from nextcloud/primary-font-color-in-capabilities 
Add the primary font color to the capabilities as well
 2017-08-15 21:27:28 +02:00
Joas Schilling
b7b4cfd6a1
Add the primary font color to the capabilities as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-15 13:50:08 +02:00
Morris Jobke
995ddc61d1 Add buttom border for header 
* allows to distinct the header from the rest of the UI for bright colors
* ref #5654

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 09:40:55 +02:00
Daniel Calviño Sánchez
b16ce1b4ba Fix preview of theming 
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:58 +02:00
Daniel Calviño Sánchez
5999b212d1 Refactor reloadStylesheets to receive absolute URLs 
This is a preparatory step for a following change in which
reloadStylesheets will have to be able to receive absolute URLs.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez
db52e861dd Provide "server.css" URL in ThemingController response 
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).

The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez
986dffdae4 Split updateStylesheet tests for success and error 
This is a preparatory step for a following commit in which the
properties present in the response will change depending on whether the
request was successful or not.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez
d7e45d45c4 Unify DataResponse format with its uses in the rest of the file 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Nextcloud bot
8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Lukas Reschke
9707ef9ba7 Merge pull request #5982 from nextcloud/fix-loading-icon-inside-upload-button-in-theming-app 
Fix loading icon inside upload button in Theming app
 2017-08-08 18:41:57 +02:00
Morris Jobke
d7645ee928 Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button 
Replace loading icon GIF with pure CSS in login button
 2017-08-08 14:40:35 +02:00
Daniel Calviño Sánchez
2398e845c9 Fix loading icon inside upload button in Theming app 
Pull request #5969 fixed the vertical alignment of loading icon and
status message in Theming app, but in doing so it broke the loading icon
inside the upload button.

When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-07 15:04:43 +02:00
Morris Jobke
de94eefe97 Merge pull request #5969 from nextcloud/fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app 
Fix vertical alignment of loading icon and status message in Theming app
 2017-08-04 12:08:16 +02:00
Morris Jobke
d63beffe9e Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon 
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
 2017-08-04 10:53:21 +02:00
Nextcloud bot
1f8a45bbd7
[tx-robot] updated from transifex 2017-08-04 00:08:18 +00:00
Daniel Calviño Sánchez
b237379fa1 Replace loading icon GIF with pure CSS loading icon 
The pure CSS loading icon uses an ::after pseudo-element, and thus it
can only be used on container elements; the input element is not a
container element, so when the class "icon-loading-small" is set on an
input element it falls back to a loading icon GIF.

This commit modifies the markup of the login button to add a div element
that holds the confirm icon and the loading icon (depending on the
case). In order to position the icon in the same place as before the
input and the icon are both wrapped by another div making possible to
set the absolute position of the icon relative to the input.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:43 +02:00
Daniel Calviño Sánchez
09a8c4a5d4 Fix code style 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez
c723d093a8 Remove superfluous selector part 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez
4fbcbd3e6d Align vertically loading icon and status message 
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez
fa7f4e5cae Do not use the same rules for loading icon than for upload icon 
The loading icon is used in a totally different way than the upload icon
and thus it should not share its CSS rules.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez
33c4a674a2 Remove ignored rules 
The removed rules were either always overriden by other rules or never
used due to not matching any element.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Joas Schilling
9abbd6ab13 Revert "Proof of concept #5593 - inline SVG icon for icon-contacts" 2017-08-03 17:27:24 +02:00
Nextcloud bot
21dd85678f
[tx-robot] updated from transifex 2017-08-03 00:08:06 +00:00
Lukas Reschke
ea2e629c6c Merge pull request #5953 from nextcloud/theming-lightness-correction 
Use same lightness calculation as the SCSS compiler for theming
 2017-08-02 23:17:19 +02:00
Marin Treselj
ffcdc96a0b Proof of concept #5593 - inline SVG icon for icon-contacts 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-02 18:27:24 +02:00
Nextcloud bot
2800e017de
[tx-robot] updated from transifex 2017-08-02 00:08:10 +00:00
Julius Härtl
9cd21bbe8a
Use same lightness calculation as the SCSS compiler for theming 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-08-01 18:09:07 +01:00
Nextcloud bot
98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot
b43abf7512
[tx-robot] updated from transifex 2017-07-29 00:08:31 +00:00
Nextcloud bot
11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Nextcloud bot
d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Nextcloud bot
46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Morris Jobke
e48ca730fe Add Android and iOS URLs to theming app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 10:20:47 +02:00
Roeland Jago Douma
e2298e0a71
Allow overwriting of IOS theming values 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-19 08:22:45 +02:00
Nextcloud bot
a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Nextcloud bot
3865c77279
[tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Joas Schilling
e335121d5e Merge pull request #5070 from nextcloud/theming-vs-themes 
Prefer custom theme over the theming app
 2017-07-13 13:41:31 +02:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Roeland Jago Douma
86a496d94a Merge pull request #5567 from nextcloud/public-capabilities 
Public capabilities API
 2017-07-12 13:04:54 +02:00
Julius Härtl
ce5ad7e7f4
Prefer custom theme over theming app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-12 11:42:15 +02:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Nextcloud bot
f59062ce83
[tx-robot] updated from transifex 2017-07-08 00:08:27 +00:00
Morris Jobke
f3c25e177f Merge pull request #5407 from nextcloud/5157-simple-logo 
Simplified Nextcloud logo icon #2
 2017-07-04 12:56:05 +02:00
Nextcloud bot
c94dbddd12
[tx-robot] updated from transifex 2017-07-03 00:08:21 +00:00
Marin Treselj
02dd7f5965
Revert background-size as requested, issue will be fixed separately 
Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
 2017-07-02 14:15:09 +02:00
Marin Treselj
3470d0a44e
Simplified Nextcloud logo icon 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-02 14:14:49 +02:00
Nextcloud bot
d49276082e
[tx-robot] updated from transifex 2017-07-01 00:08:28 +00:00
Julius Härtl
42d9be4529
Expose theming capabilities to public 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-30 11:08:54 +02:00
Nextcloud bot
4526b8d6a3
[tx-robot] updated from transifex 2017-06-24 00:08:29 +00:00
Nextcloud bot
146c699eb4
[tx-robot] updated from transifex 2017-06-21 00:08:15 +00:00
Julius Härtl
adf2f88873
Fix more icon in apps menu on bright backgrounds 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-17 10:14:21 +02:00
Nextcloud bot
26d6c4a64a
[tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Nextcloud bot
74654288e6
[tx-robot] updated from transifex 2017-06-16 00:08:44 +00:00
Nextcloud bot
ea64cb0028
[tx-robot] updated from transifex 2017-06-13 00:08:22 +00:00
Jan-Christoph Borchardt
67069facb7 Show reset to default button for theming values on hover, fix #3198 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-06-09 15:54:17 +02:00
Nextcloud bot
628284a34c
[tx-robot] updated from transifex 2017-06-09 00:08:24 +00:00
Nextcloud bot
a3c5d43cd5
[tx-robot] updated from transifex 2017-06-07 00:09:00 +00:00
Nextcloud bot
c70de161cf
[tx-robot] updated from transifex 2017-06-02 00:08:30 +00:00
Nextcloud bot
8801b68d45
[tx-robot] updated from transifex 2017-06-01 00:08:38 +00:00
Nextcloud bot
5f9cc5a2d5
[tx-robot] updated from transifex 2017-05-31 00:08:48 +00:00
Nextcloud bot
b9b7f8bede
[tx-robot] updated from transifex 2017-05-30 00:08:44 +00:00
Nextcloud bot
c1925ddfd0
[tx-robot] updated from transifex 2017-05-26 00:08:16 +00:00
Nextcloud bot
a46d2f1d39
[tx-robot] updated from transifex 2017-05-25 00:08:04 +00:00
Nextcloud bot
6cc26efbc5
[tx-robot] updated from transifex 2017-05-24 00:08:22 +00:00
Nextcloud bot
9c8a838624
[tx-robot] updated from transifex 2017-05-23 00:08:29 +00:00
Joas Schilling
1efd961476 Merge pull request #5010 from nextcloud/fix-starting-lower-case-letter-in-tooltip-of-theming-app 
Fix starting lower case letter in tooltip of Theming app
 2017-05-22 15:03:18 +02:00
Joas Schilling
bc8fbc1a67
Bump app versions as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-22 10:35:25 +02:00
Joas Schilling
fdfe8f7f15
Adjust version requirement 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-22 10:32:05 +02:00
Daniel Calviño Sánchez
8a05494964 Fix starting lower case letter in tooltip of Theming app 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-20 17:10:26 +02:00
Lukas Reschke
c1c676f602 Merge pull request #4910 from nextcloud/make-the-logo-smaller-cream 
Fix logo being too big on log in page, fix #4585
 2017-05-19 20:50:09 +02:00
Julius Härtl
52f10c436e
Scale logo only for custom ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-19 16:18:09 +02:00
Nextcloud bot
e24105feba
[tx-robot] updated from transifex 2017-05-19 00:08:26 +00:00
Lukas Reschke
c605472950 Merge pull request #4888 from nextcloud/theming-fallback-icons 
Fallback to default favicon
 2017-05-18 23:30:02 +02:00
Julius Härtl
489131333a
Inject FileAccessHelper for proper testing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-18 10:45:42 +02:00
Nextcloud bot
d41fd7471c
[tx-robot] updated from transifex 2017-05-18 00:07:48 +00:00
Morris Jobke
2ec616323b Merge pull request #4918 from nextcloud/theming-capabilities-plain-background 
OCS Return color when theming uses no background image
 2017-05-17 10:42:41 -05:00
Julius Härtl
81847c01b0
Return color when theming uses no background image 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 13:16:44 +02:00
Julius Härtl
639168ede4
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:16:59 +02:00
Julius Härtl
d3865b6096
Use appdata logo when generating icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:14:37 +02:00
Julius Härtl
edb5502b9d
Add proper Content-Type to icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:11:29 +02:00
Julius Härtl
1157f413c9
Fallback to default favicon 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:11:29 +02:00
Jan-Christoph Borchardt
70c750dacc Fix logo being too big on log in page, fix #4585 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-05-16 15:53:54 +02:00
Nextcloud bot
b1bd9ff0b9
[tx-robot] updated from transifex 2017-05-14 00:07:54 +00:00
Joas Schilling
37d333c3b5
Don't open the dialog for logo and background 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-12 09:48:51 +02:00
Morris Jobke
c2350f237e Clicking on theming preview triggers fileupload dialog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-11 19:49:36 -05:00
Nextcloud bot
241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Nextcloud bot
fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Julius Härtl
fb204de7f6
Fix theming preview for background image 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-09 18:21:41 +02:00
Nextcloud bot
37b847ec48
[tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot
f6a4028fad
[tx-robot] updated from transifex 2017-05-09 00:07:51 +00:00
Nextcloud bot
9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Lukas Reschke
099234cf12
Add function to request SVG or regular fallback image 
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 14:51:55 +02:00
Julius Härtl
2801f5139b
Adjust login button color and remove border 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Julius Härtl
510f7cf1b6
Fix tests for theming backgroundColor 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Julius Haertl
4199a56912
Theming app: Add plain background color option 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-05-08 10:16:29 +02:00
Nextcloud bot
6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot
56bb8745df
[tx-robot] updated from transifex 2017-05-07 00:07:31 +00:00
Nextcloud bot
59ee22101f
[tx-robot] updated from transifex 2017-05-06 00:07:33 +00:00
Morris Jobke
ac04fb8277 Fix invalid theming URLs 
* logo and background image had the cache buster applied twice:
  background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0);

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-05 00:37:32 -03:00
Nextcloud bot
619d09529c
[tx-robot] updated from transifex 2017-05-05 00:07:28 +00:00
Nextcloud bot
806aeae71d
[tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Nextcloud bot
3dbf30c220
[tx-robot] updated from transifex 2017-05-03 00:07:31 +00:00
Nextcloud bot
f27d382c47
[tx-robot] updated from transifex 2017-05-02 00:07:20 +00:00
Morris Jobke
dba55f950a Merge pull request #4594 from nextcloud/theming-image-default 
Delete theming images when logo/background is reset to default
 2017-05-01 12:55:00 -03:00
Nextcloud bot
2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Julius Härtl
7c69c117e2
Delete theming images when logo/background is reset to default 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-30 11:04:55 -03:00
Nextcloud bot
4518f6dc64
[tx-robot] updated from transifex 2017-04-30 00:07:21 +00:00
Julius Härtl
6e215a0874
Code cleanup and preview for undo actions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Julius Härtl
b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Julius Härtl
6b8341ce4b
Use generated SCSS for theming preview 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Nextcloud bot
c4673224d1
[tx-robot] updated from transifex 2017-04-29 00:07:17 +00:00
Morris Jobke
ed21ab56c7 Merge pull request #4584 from nextcloud/hint-theming 
Hint: Theming customizes the look and feel of supported clients too
 2017-04-28 19:11:34 -03:00
Julius Härtl
d13e311aaf
Invert new header icons on bright theming colors 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-28 15:53:33 -03:00
Marius Blüm
2eeed15f19
Hint: Theming customizes the look and feel of supported clients too 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-04-28 20:34:58 +02:00
Nextcloud bot
6908818999
[tx-robot] updated from transifex 2017-04-28 00:07:41 +00:00
Frank Karlitschek
5e1ce69b05 adding some documentation hints and some smaller cleanup 2017-04-25 17:45:35 +02:00
Joas Schilling
6448cf5748
Mock it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 12:16:07 +02:00
Joas Schilling
bedd500884
Logo and background URLs must be relative 
They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:43:06 +02:00
Julius Härtl
bc1efdf2e1
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 11:39:49 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 11:39:45 +02:00
Nextcloud bot
133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Joas Schilling
8c703c954d
Fix theming tests 
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:10:34 +02:00
Nextcloud bot
df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot
69e0e2420c
[tx-robot] updated from transifex 2017-04-16 00:07:23 +00:00
Nextcloud bot
dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Nextcloud bot
0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Lukas Reschke
afb5d45705 Merge pull request #4256 from nextcloud/theming 
Move OC_Defaults to OCP\Defaults
 2017-04-11 14:39:46 +02:00
Morris Jobke
d83c8e0271
ThemingDefaults append cacheBusterCounter to logo URL by default 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:09 -05:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Nextcloud bot
4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Lukas Reschke
281ad406e8
Add support for theming 
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Nextcloud bot
7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Nextcloud bot
84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00