14fd5ffe9a
Merge branch 'Bootstrap4'
2016-04-28 15:56:44 +02:00
73b1dd9511
Merge remote-tracking branch 'origin/Bootstrap4' into Bootstrap4
2016-04-28 15:30:26 +02:00
6640066118
Merge branch 'master' into Bootstrap4
...
# Conflicts:
# sass/theme.scss
2016-04-28 15:30:25 +02:00
0dff6837d5
Revert "Merge pull request #25 from kylemorgan49/master"
...
This reverts commit 9c11a89a63b14895924f
2016-04-28 15:19:38 +02:00
9c11a89a63
Merge pull request #25 from kylemorgan49/master
...
README Improvements
2016-04-28 08:37:15 +02:00
f083fd6952
readme: typo
2016-04-27 15:19:28 -06:00
6788c4df89
readme: typo
2016-04-27 15:17:41 -06:00
d8721440c3
Update README
2016-04-27 15:16:27 -06:00
f806092542
Testing...
2016-04-27 14:49:54 -06:00
4e3b9d8afa
Standardize header capitalization
2016-04-27 11:31:38 -06:00
69af444d86
Standardize header markdown
2016-04-27 11:29:52 -06:00
02ce6258d7
More small changes...
2016-04-27 11:27:46 -06:00
6a78d0ac76
Better English and typography in README.md
2016-04-26 15:51:49 -06:00
1aab2d84cb
Solving merging conflicts between bs4 branch and master
2016-04-26 14:09:19 +02:00
47d33ec0c4
Merge branch 'master' into Bootstrap4
...
# Conflicts:
# sass/theme.scss
2016-04-26 14:05:22 +02:00
6bbf06aba1
bs4 fine tuning
2016-04-26 14:05:02 +02:00
b14895924f
adding assets scss files into understrap /scss folder
...
adding for any asset scss files in between understrap and original
sources. So you can exclude single scss files by commenting it out
without overwriting your changes during an update
2016-04-25 14:28:00 +02:00
7177b3ef9c
Merge pull request #22 from kromix/Update-German-Translation
...
fixed german translation
2016-04-18 08:53:38 +02:00
7cfa44355a
Merge pull request #23 from dvlopes/master
...
Added support to browser-sync.
2016-04-18 08:53:21 +02:00
bd0f667532
Added support to browser-sync.
2016-04-15 18:06:10 -03:00
1d671e85fe
fixed german translation
2016-04-15 17:48:36 +02:00
eba7cab558
adding new screenshot to reflect layout changes
2016-04-15 09:04:42 +02:00
b323b9632e
Update infos about 0.4.0 pre release
2016-04-15 08:34:33 +02:00
91b45a1747
Updating language template file and get translations
2016-04-15 08:25:24 +02:00
7c9ebf15d3
Merge branch 'master' into Bootstrap4
2016-04-15 08:08:55 +02:00
77eee31b54
Merge pull request #21 from dvlopes/master thx @dvlopes
...
POT update and Brazilian Portuguese translation.
2016-04-15 07:57:27 +02:00
3d07b2bfda
Updated POT file and pt_BR translations to version 0.3.8.
2016-04-14 21:01:19 -03:00
f780bca52d
Added Brazilian Portuguese (pt-BR) translation (fix theme description).
2016-04-14 20:52:20 -03:00
62e1da41f8
Added Brazilian Portuguese (pt-BR) translation.
2016-04-14 20:41:58 -03:00
65012ff20e
Add bs4 assets for Bootstrap4 branch
2016-04-06 13:24:59 +02:00
d62632d693
successfully switching back and forth
2016-04-06 13:24:07 +02:00
0caa86ea67
Merge branch 'Bootstrap4'
...
# Conflicts:
# css/theme.css
# css/theme.min.css
2016-04-06 13:21:39 +02:00
edad647856
trying BS4
2016-04-06 13:20:46 +02:00
4d472ca8c2
More BS4 preparations
2016-04-06 13:18:04 +02:00
27dd486939
Merge branch 'master' into Bootstrap4
2016-04-06 10:46:29 +02:00
32c64835a3
test
2016-04-06 10:46:24 +02:00
a80dd33a6d
some renaming
2016-04-06 10:45:57 +02:00
5d6e139c7e
Extracting jQuery from theme.min.js
...
Just one JS file caused some trouble. Theme loads the WP jQuery file as
extra file again
2016-04-06 10:17:43 +02:00
c3e4083e8d
Merge branch 'master' into Bootstrap4
2016-04-06 09:54:42 +02:00
d6c8bc4284
Preparations for BS4 update
...
adding Bootstrap4 alpha as dependency and prepare the gulpfile.js and
/sass/theme.scss for switching to BS4
2016-04-06 09:54:31 +02:00
9d98e6f117
solved issue #14 thx to @Thomas-A-Reinert
2016-03-22 17:39:57 +01:00
44e27726e0
updating the owl.carousel sass dependencies
2016-03-22 17:36:54 +01:00
2861f7501b
resorting dev assets
2016-03-20 10:40:38 +01:00
36894c0f65
adding a "gulp script" task
2016-03-20 10:33:18 +01:00
fbf1ba5bef
Concat all JS into one file, so no need to enqueue anything
2016-03-20 09:52:49 +01:00
0906c5b73e
sunday mornin coffee
2016-03-20 09:49:34 +01:00
bfcf0172b5
no more in use - thx to: @robwilde
2016-03-20 09:49:34 +01:00
ac90789c86
updating dependency assets
2016-03-10 13:52:48 +01:00
4e537412ae
adding carousel js files to /js folder by default
2016-03-10 13:34:30 +01:00
f7cb61567e
fixing typo in closing tag
2016-03-10 13:22:28 +01:00
koenemann
Holger
Kyle Morgan
Holger Könemann
Diego Versiani
Kromix