mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
51,982 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

85 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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 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
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
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 6b8341ce4b
Use generated SCSS for theming preview 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -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
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
Jan-Christoph Borchardt e595c50042 theming: move reset button into field and only show when focused 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-16 11:38:01 +01:00
Julius Haertl 0e8b138534
Theming: Show loading spinner while uploading files 2016-08-30 06:40:41 +02:00
Julius Haertl d95aec2ed2
Theming: Add preview for login screen 2016-08-26 12:08:12 +02:00
Jan-Christoph Borchardt 261396019d design and layout fixes for Theming app 2016-06-27 10:26:24 +02:00
Bjoern Schiessle cc321bc140 add some visual feedback if the operation was succesful or not 2016-06-27 10:26:22 +02:00
Bjoern Schiessle 10f6ca20bc write theme settings to database 2016-06-27 10:26:22 +02:00
Jan-Christoph Borchardt 363b76faee basic information architecture for the theming app 2016-06-27 10:26:22 +02:00
Bjoern Schiessle 20d250a674 initial commit for the theming app 2016-06-27 10:26:22 +02:00