Skip to content

Commit

Permalink
Merge pull request #50 from ucfopen/dev/2.4.0
Browse files Browse the repository at this point in the history
Dev/2.4.0
  • Loading branch information
clpetersonucf authored Jun 12, 2019
2 parents afd8a29 + ffd76ca commit 6f11da3
Show file tree
Hide file tree
Showing 24 changed files with 2,701 additions and 2,551 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
language: node_js
node_js:
- '6'
- '12'
cache:
yarn: true
directories:
- node_modules
before_install:
- npm install -g yarn # make sure yarn is new
- npm config set spin false
- npm install -g npm@^6.9.0
deploy:
provider: npm
email: [email protected]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Materia Widget Development Kit (MDK)
# Materia Widget Development Kit (MWDK)

Materia Widget Development Kit (MDK) is a local dev environment for quickly building Materia Widgets.
Materia Widget Development Kit (MWDK) is a local dev environment for quickly building Materia Widgets.

## Features

Expand All @@ -12,5 +12,5 @@ Materia Widget Development Kit (MDK) is a local dev environment for quickly buil

## Setup

> @TODO
* Require as a dependency for any Materia widget

15 changes: 0 additions & 15 deletions assets/css/mdk-creator.css

This file was deleted.

File renamed without changes.
File renamed without changes.
22 changes: 18 additions & 4 deletions assets/css/mdk-main.css → assets/css/mwdk-main.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ body {
border-bottom: solid 4px #0093e7;
}

.tools {
margin-top: -12px;
float: right;
}

.creator {
margin-left: 0px;
margin-top: 200px;
Expand All @@ -76,8 +81,12 @@ body {
}

.center {
width: calc(100% - 330px);
height: 600px;
/*
Default to 100% in creator and player
In the player, the js will set the size according
*/
width: 100%;
height: 100%;
}

.center.full {
Expand All @@ -102,7 +111,7 @@ body {
justify-content: space-around;
}

#mdk_dialog {
#mwdk_dialog {
position: relative;
background: #fff;

Expand All @@ -112,7 +121,7 @@ body {
margin: 0 auto;
}

#mdk_dialog pre {
#mwdk_dialog pre {
font-size: 10px;
}

Expand Down Expand Up @@ -252,3 +261,8 @@ h2 {
height: 360px;
display: block;
}

#container {
height: 100%;
width: 100%;
}
14 changes: 7 additions & 7 deletions assets/css/mdk-player.css → assets/css/mwdk-player.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#body.player_mdk .logo {
#body.player_mwdk .logo {
color: #fff;
}

Expand All @@ -10,24 +10,24 @@
margin-left: 120px;
}

#body.player_mdk .widget[ng-app="materia"]{
#body.player_mwdk .widget[ng-app="materia"]{
display: block;
width: 100%;
height: 100%;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.5);
margin-top: 20px;
}

#body.player_mdk #build-options hr,
#body.player_mdk #test-options hr {
#body.player_mwdk #build-options hr,
#body.player_mwdk #test-options hr {
margin-top: 20px;
}

#body.player_mdk #build-options p.disclaimer,
#body.player_mdk #test-options p.disclaimer {
#body.player_mwdk #build-options p.disclaimer,
#body.player_mwdk #test-options p.disclaimer {
font-size: 11px;
}

#body.player_mdk #rebuild button {
#body.player_mwdk #rebuild button {
margin-left: 10px;
}
Loading

0 comments on commit 6f11da3

Please sign in to comment.