Luis Ramos
eeac75ade1
Merge pull request #3689 from luisramos0/2-0-fix-split-button-bug
...
[Spree Upgrade] Fix split button reappearing when editing line item quantity
2019-04-16 15:28:43 +01:00
Pau Pérez Fabregat
6d0ecdc4a6
Merge pull request #3721 from Matt-Yorkley/subs_styles
...
Subs styles
2019-04-15 12:53:27 +02:00
Luis Ramos
984155013c
Merge pull request #3648 from luisramos0/2-0-fix-ui-issue
...
[Spree Upgrade] Fix "back to list" button overlap and remove configurations menu from payments methods list
2019-04-10 21:46:40 +01:00
Matt-Yorkley
14fd821283
Rename states SCSS file for clarity
2019-04-10 13:12:44 +01:00
Matt-Yorkley
9e0f35d635
Re-adjust buttons. Much better!
2019-04-10 12:15:21 +01:00
Matt-Yorkley
e13db873b0
Fix subs panel button vertical alignment
2019-04-10 12:15:21 +01:00
Matt-Yorkley
896a45c399
Fix subs state buttons
2019-04-10 12:15:21 +01:00
Matt-Yorkley
3968cfd238
Fix chevron horizontal position
2019-04-10 12:15:21 +01:00
luisramos0
ea52600fc5
Fix split button reappearing when editing line item quantity
2019-04-02 21:58:29 +01:00
luisramos0
5c69d6c9dc
Fix page action in the backoffice when translations are long
2019-04-02 16:58:45 +01:00
Matt-Yorkley
4a0e5a42a3
Fix admin menu items different heights
2019-04-01 12:11:29 +01:00
Matt-Yorkley
082be15df2
Fix admin menu mixed font weights
2019-04-01 12:00:29 +01:00
Matt-Yorkley
fa91a66de6
Fix button padding after Spree 2 font changes increased the vertical height
2019-04-01 11:48:18 +01:00
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
luisramos0
2295981375
Merge branch '2-0-stable' into 2-0-remove-unused-new-v2-features
2019-03-12 16:55:48 +00:00
Maikel Linke
6f875e83ec
Remove unconventional and unused ng:cloak selector
2019-03-12 09:10:39 +11:00
Maikel Linke
9e33ef8140
Style ng-cloak directive
2019-03-12 09:09:52 +11:00
Maikel Linke
30c1a8d924
Move ng-cloak CSS to components
2019-03-12 08:59:59 +11:00
Maikel Linke
2d7498b77b
Hide elements before Angular is loaded
...
The "Loading orders" spinner is still visible from the beginning so that
it can be used as indicator for when the page is loaded.
Before, the "No orders found" message was visible between page load and
Angular initilisation.
2019-03-08 14:23:18 +11:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
luisramos0
37685c8107
Move the code that hides the split order button from js to css
2019-02-26 12:34:07 +00:00
François Turbelin
e1953c279b
Move jquery-ui-timepicker libs to vendor dir
2019-02-25 22:48:30 +01:00
François Turbelin
ab86332949
Tune up config and style
2019-02-25 22:22:27 +01:00
François Turbelin
68fd6de39b
Update Jquery datetimepicker lib to v1.6.3
2019-02-25 22:22:27 +01:00
luisramos0
0501db1782
Remove changes related to enterprise trials as they dont make sense without business models and account invoices
2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
Pau Pérez Fabregat
8f63be9519
Merge pull request #2733 from kristinalim/fix-subscription_should_not_require_future_oc
...
Reduce restrictions for adding a variant to a subscription
2019-02-06 21:24:57 +01:00
Pau Pérez Fabregat
c9a8ec84c0
Merge pull request #3359 from kevinchristianson/ready
...
Convert sass files to scss
2019-01-28 20:02:37 +01:00
Kristina Lim
5992bba97b
Import color variables in new page SCSS partials
...
"admin/all.css" which imports these SCSS partials already imports the
color variables in "admin/variables", so actually there should be no
need to import the variables again.
However, "application.css" calls "require_tree", which means asset
precompilation through Sprockets would attempt to compile each of the
SCSS partials individually. When compiled individually, the color
variables are not available to these partials.
This is a quick solution to allow precompilation of "application.css" to
complete.
2019-01-26 03:29:19 +08:00
Kristina Lim
c23002102c
Add warning for unavailable subscription items
2019-01-26 02:03:55 +08:00
Pau Pérez Fabregat
8320dc75e8
Merge pull request #3002 from kevinchristianson/margin-fix
...
Fix bad spacing on account settings error page
2019-01-23 16:09:14 +01:00
Kevin Christianson
6b7273f685
Convert sass files to scss
2019-01-19 22:40:41 -06:00
nozakis
972bfd5e62
Fixed bad margins on the account settings error page.
2019-01-19 16:23:13 -06:00
Matt-Yorkley
e624faaacb
Add 'please wait' message to bulk invoice modal
2019-01-10 09:57:06 +00:00
Matt-Yorkley
6b6a41cfbc
Update CSS
2019-01-10 09:57:06 +00:00
Matt-Yorkley
638dc6eada
Add polling and show action
2019-01-10 09:57:06 +00:00
Matt-Yorkley
42cf96e635
Disable button unless orders selected
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4ec0f0ff73
Add bulk invoices printing
2019-01-10 09:57:06 +00:00
Kristina Lim
71db9f5289
Import CSS variables in admin/components/input
2018-12-06 14:08:06 +08:00
Kristina Lim
f5dc03e118
Style disabled text fields in admin pages
2018-12-05 17:40:29 +08:00
luisramos0
1c5d94472f
Make colors.css relative reference to branding.css an absolute reference so that colors can be imported in engines
2018-11-29 18:39:58 +00:00
luisramos0
cdc5899791
Moved cookies policy modal and cookies banner colors to darkswarm/base/colors.scss
2018-11-29 11:47:51 +00:00
Pau Pérez Fabregat
8946fe3ce8
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
...
Add per_page controls to admin orders index
2018-10-15 12:17:39 +02:00
Pau Pérez Fabregat
fe149967e4
Merge pull request #2521 from luisramos0/cookies_in_engine
...
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
2018-10-15 10:03:30 +02:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
Matt-Yorkley
017e3d14df
Use variable colour assignment
2018-10-02 11:10:21 +01:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
Matt-Yorkley
68f0c80016
Add loading message and spinner
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00