mirrors / creativetimofficial--ui

文件历史

148 提交 15 分支 9 Git 标签
bootstrap-3
提交图

76 次代码提交

作者 SHA1 备注 提交日期
Elena-Cristina Conacel 0ef1cbf6cb Merge branch 'master' into githubMaster 
# Conflicts:
#	assets/css/material-dashboard.css
#	assets/js/material-dashboard.js
#	assets/sass/material-dashboard.scss
 2017-02-08 16:32:31 +02:00
Elena-Cristina Conacel 5b8200711e - switched to 3 digits in copyright. 2017-02-08 16:13:42 +02:00
Elena-Cristina Conacel 97fb27f1f5 - added copyright in files. 2017-01-19 19:07:33 +02:00
Axelut b64206c52f added upgrade page 2016-11-10 16:39:57 +02:00
Axelut e9b6684d50 update v1.1.0 in files 2016-11-10 13:04:15 +02:00
Dragos 797a93c670 added button upgrade to pro 2016-11-07 17:53:48 +02:00
Axelut 35fececb39 - initial release v1.0.0 2016-10-02 17:40:04 +03:00
Dragos Ct 28ea435c11 documentation fixed on media query 2016-09-21 18:21:11 +03:00
Dragos Ct f4abfaa391 Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard 
* 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard:
  - added images - removed icons - updates in components documentation
 2016-09-21 17:48:03 +03:00
Dragos Ct 0d731023c0 changes for documentation off canvas sidebar 2016-09-21 17:47:54 +03:00
Axelut bf21b64774 Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard 
* 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard:
  small change to typography page
  indented all pages
  working on icons text
  icons iframe added margin
  add float none and margin changed to navbar-form

# Conflicts:
#	examples/dashboard.html
#	examples/icons.html
#	examples/maps.html
#	examples/notifications.html
#	examples/table.html
#	examples/template.html
#	examples/typography.html
#	examples/user.html
 2016-09-21 17:34:20 +03:00
Axelut 3fb9937066 - added images 
- removed icons
- updates in components documentation
 2016-09-21 17:25:29 +03:00
Dragos Ct a02db96f65 Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard 
* 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard:
  finished check documentation and classes
 2016-09-21 16:28:52 +03:00
Axelut 8982315171 finished check documentation and classes 2016-09-21 16:14:38 +03:00
Dragos Ct b617adca91 icons iframe added margin 2016-09-21 15:32:59 +03:00
Dragos Ct d8c19ca3f8 add float none and margin changed to navbar-form 2016-09-21 15:13:04 +03:00
Axelut 7f4dc59477 added search for in navbar 2016-09-21 14:45:32 +03:00
Axelut 204840f7c4 Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard 
* 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard:
  small changes on typography + demo-documentation.css
  added buddha bar to scss and material js
  add min-height on card-chart
  comment on sidebar with colors html all pages
  removed map css

# Conflicts:
#	assets/css/material-dashboard.css.map
 2016-09-21 02:31:16 +03:00
Axelut 77e65d9d76 added colors in navbar transparent dropdown default 
fix design for alert
added new function for animations for bar charts
fixed issue with charts drawing on resize (still need a better solution)
removed images sass
 2016-09-21 02:30:19 +03:00
Dragos Ct e951ae4630 added buddha bar to scss and material js 2016-09-20 16:48:09 +03:00
Dragos Ct 6dd6f7454b add min-height on card-chart 2016-09-20 16:42:10 +03:00
Axelut 8775c4b222 small fixes 2016-09-20 16:25:00 +03:00
Axelut 9d7096a806 Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard 
* 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard:
  changes to tutorial and components page
  working on tutorial-components
  template page replace font awesome with material-icons
  added border to card-footer
  removed unnecessary js files + add margin top to map + add new jquery 3.1.0.min.js
  removed all link href animation css
  removed div with space 70 from all pages + add margin-top: 70px to content +
  erased unnecessary css from demo.css
  add nav margin top + notifications arranged buttons + working on tutorial and documentation + add space-70 div to template.html
  add link to header for material kit with ref
  add instagram button to footer documentation
  add btn-just-icon on documentation for footer buttons
  erased btn-rose + changes to documentation erased button styles and btn with icons
  documentation chart work
  moved documentation.css to documentation folder

# Conflicts:
#	assets/css/material-dashboard.css
#	assets/sass/md/_cards.scss
 2016-09-20 16:12:45 +03:00
Axelut 390828167a new card in dashboard, clean SCSS 2016-09-20 16:11:44 +03:00
Dragos Ct 902ca6f0a6 added border to card-footer 2016-09-20 14:46:18 +03:00
Dragos Ct b0d593e5c6 removed div with space 70 from all pages + 
add margin-top: 70px to content +
 2016-09-20 13:33:24 +03:00
Dragos Ct 8e7ca7ffc2 add nav margin top + 
notifications arranged buttons +
working on tutorial and documentation +
add space-70 div to template.html
 2016-09-20 13:20:08 +03:00
Axelut 08c541938d added tasks in all pages for in tasks card 2016-09-20 12:59:36 +03:00
Dragos Ct 1eae28424f erased btn-rose + 
changes to documentation erased button styles and btn with icons
 2016-09-20 11:45:36 +03:00
Axelut 0808544350 small adjustments 2016-09-20 02:03:11 +03:00
Dragos Ct a107615526 small changes + 
add date with js on footer
 2016-09-19 17:41:11 +03:00
Dragos Ct 5064a8dab9 height 100 vh for sidebar + 
wrapper prop double erased +
padding-bottom for sidebar-wrapper
 2016-09-19 16:28:34 +03:00
Dragos Ct eb0b7123d5 fixed small bug 2016-09-19 13:51:41 +03:00
Dragos Ct 4d444d30dc put logo outside sidebar-wrapper + 
changes
 2016-09-15 16:40:16 +03:00
Dragos Ct ebdff2a1da changed navbar menu mobile with bootstrap-navbar-mobile + 
working on navbar mobile
 2016-09-15 16:08:42 +03:00
Dragos Ct ffdcfbcebe working on material menu navbar 2016-09-14 17:39:00 +03:00
Dragos Ct 2445bdfbd1 replaced mkd with md 2016-09-14 13:20:42 +03:00
Dragos Ct ad2a2c3889 added border to logo + 
changed light-blue with cyan +
changed margin from li a
 2016-09-14 12:50:23 +03:00
Dragos Ct 31fc3e0f13 Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard 
* 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard:
  finished stats ards
  working on dashboard charts, remove chart.js library
  many changes, almost having a final idea :D
  design idea 3
  design idea

# Conflicts:
#	assets/css/material-dashboard.css
#	assets/js/demo.js
#	assets/sass/mkd/_chartist.scss
#	assets/sass/mkd/_sidebar-and-main-panel.scss
#	dashboard.html
 2016-09-13 11:45:59 +03:00
Axelut c13634f77c finished stats ards 2016-09-13 02:41:38 +03:00
Axelut c599d736e3 working on dashboard charts, remove chart.js library 2016-09-10 19:18:15 +03:00
Axelut 8d93540365 many changes, almost having a final idea :D 2016-09-08 03:03:26 +03:00
Axelut 1a4851bff6 design idea 3 2016-09-01 21:26:25 +03:00
Axelut 237d280180 design idea 2016-07-24 23:32:05 +03:00
Dragos Ct be86fff29b $black changed to $black-color 2016-06-21 12:24:08 +03:00
Dragos Ct 510e3e8419 bug fixed with ct-big-chart class 2016-06-21 12:14:55 +03:00
Dragos Ct efe3eb8b7e charturi 2016-06-16 18:29:04 +03:00
Dragos Ct 493ad5830f WIP stats cards 2016-06-16 12:49:19 +03:00
Dragos Ct 58df9696de working on charts 2016-06-16 11:44:36 +03:00
Dragos Ct a4c4f93359 added border-radius to cards + 
added margin to footer
 2016-06-10 16:49:51 +03:00