Skip to content

Commit

Permalink
[GRAPH-1814] Style editable text (#24)
Browse files Browse the repository at this point in the history
* docs and publish icons

* styles for editable text

* update packages versions
  • Loading branch information
cristinatraba authored and Nacho Justicia committed Mar 7, 2019
1 parent 6d49484 commit 91c6f0a
Show file tree
Hide file tree
Showing 20 changed files with 93 additions and 29 deletions.
10 changes: 5 additions & 5 deletions graphext-versions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/datetime": "3.4.0-graphext7",
"@blueprintjs/icons": "3.3.0-graphext9",
"@blueprintjs/select": "3.3.0-graphext8",
"@blueprintjs/table": "3.3.0-graphext11"
"@blueprintjs/core": "3.9.0-graphext13",
"@blueprintjs/datetime": "3.4.0-graphext8",
"@blueprintjs/icons": "3.3.0-graphext10",
"@blueprintjs/select": "3.3.0-graphext9",
"@blueprintjs/table": "3.3.0-graphext12"
}
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blueprintjs/core",
"version": "3.9.0-graphext12",
"version": "3.9.0-graphext13",
"description": "Core styles & components",
"main": "lib/cjs/index.js",
"module": "lib/esm/index.js",
Expand Down Expand Up @@ -39,7 +39,7 @@
"verify": "npm-run-all compile -p dist test lint"
},
"dependencies": {
"@blueprintjs/icons": "3.3.0-graphext9",
"@blueprintjs/icons": "3.3.0-graphext10",
"@types/dom4": "^2.0.0",
"classnames": "^2.2",
"dom4": "^2.0.1",
Expand Down
26 changes: 26 additions & 0 deletions packages/core/src/_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,32 @@
}
}

// Editable Text
.#{$ns}-multiline .#{$ns}-editable-text-content {
margin: 0;
}
.#{$ns}-dark .#{$ns}-editable-text.#{$ns}-editable-text-editing::before, .#{$ns}-editable-text.#{$ns}-editable-text-editing::before{
box-shadow: none;
}
.#{$ns}-dark .#{$ns}-editable-text:hover::before{
box-shadow: none;
background: $dark-gray5;
}

.#{$ns}-editable-text-editing:not([class*="#{$ns}-multiline"])::before , .#{$ns}-editable-text:not([class*="#{$ns}-multiline"])::before {
width: 100%;
height: 100%;
top: 0;
right: 0;
bottom: 0;
left: 0;
}

.#{$ns}-editable-text-input:not(textarea), .#{$ns}-editable-text-content:not(textarea) {
margin: 8px 16px;
}



// Tag Input

Expand Down
4 changes: 4 additions & 0 deletions packages/core/src/common/_customs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ $dark-minimal-button-background-color-active: rgba($dark-gray5, 0.3) !important;
$input-padding-horizontal: $pt-grid-size * 2;
$dark-input-background-color: $dark-gray4;
$input-box-shadow: none;
$input-box-shadow-focus: none;
$pt-dark-input-box-shadow: none;
$dark-input-shadow-color-focus: transparent;


// Controls (switch, radio, checkbox)
$dark-switch-background-color: $dark-gray2;
Expand Down
4 changes: 2 additions & 2 deletions packages/datetime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blueprintjs/datetime",
"version": "3.4.0-graphext7",
"version": "3.4.0-graphext8",
"description": "Components for interacting with dates and times",
"main": "lib/cjs/index.js",
"module": "lib/esm/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"verify": "npm-run-all compile -p dist test lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/core": "3.9.0-graphext13",
"classnames": "^2.2",
"react-day-picker": "^7.1.10",
"tslib": "^1.9.0"
Expand Down
10 changes: 5 additions & 5 deletions packages/docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
"verify": "run-p dist lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/datetime": "3.4.0-graphext7",
"@blueprintjs/core": "3.9.0-graphext13",
"@blueprintjs/datetime": "3.4.0-graphext8",
"@blueprintjs/docs-data": "^3.0.0",
"@blueprintjs/docs-theme": "^3.0.0",
"@blueprintjs/icons": "3.3.0-graphext9",
"@blueprintjs/icons": "3.3.0-graphext10",
"@blueprintjs/labs": "^0.16.2",
"@blueprintjs/select": "3.3.0-graphext8",
"@blueprintjs/table": "3.3.0-graphext11",
"@blueprintjs/select": "3.3.0-graphext9",
"@blueprintjs/table": "3.3.0-graphext12",
"@blueprintjs/test-commons": "^0.8.0",
"@blueprintjs/timezone": "^3.0.0",
"@types/downloadjs": "^1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"test": "exit 0"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/core": "3.9.0-graphext13",
"@blueprintjs/docs-theme": "^3.0.0",
"documentalist": "^1.4.0",
"better-handlebars": "github:wmeldon/better-handlebars",
Expand Down
4 changes: 2 additions & 2 deletions packages/docs-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"verify": "npm-run-all compile -p dist lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/select": "3.3.0-graphext8",
"@blueprintjs/core": "3.9.0-graphext13",
"@blueprintjs/select": "3.3.0-graphext9",
"classnames": "^2.2",
"documentalist": "^1.4.0",
"fuzzaldrin-plus": "^0.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blueprintjs/icons",
"version": "3.3.0-graphext9",
"version": "3.3.0-graphext10",
"description": "Components, fonts, icons, and css files for creating and displaying icons.",
"main": "lib/cjs/index.js",
"module": "lib/esm/index.js",
Expand Down
14 changes: 14 additions & 0 deletions packages/icons/resources/icons/icons.json
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,20 @@
"group": "Graphext",
"content": "\\e9ff"
},
{
"displayName": "Docs",
"iconName": "g-docs",
"tags": "documentation, paper, guide, manual",
"group": "Graphext",
"content": "\\ea00"
},
{
"displayName": "Publish",
"iconName": "g-publish",
"tags": "publicate, publication, share, send, public",
"group": "Graphext",
"content": "\\ea01"
},
{
"displayName": "Blank",
"iconName": "blank",
Expand Down
4 changes: 2 additions & 2 deletions packages/labs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"verify": "npm-run-all compile -p dist test lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/select": "3.3.0-graphext8",
"@blueprintjs/core": "3.9.0-graphext13",
"@blueprintjs/select": "3.3.0-graphext9",
"@blueprintjs/timezone": "^3.0.0",
"classnames": "^2.2",
"tslib": "^1.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/landing-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"verify": "run-p dist lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/core": "3.9.0-graphext13",
"classnames": "^2.2.5",
"react": "^16.2.0",
"react-dom": "^16.2.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/select/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blueprintjs/select",
"version": "3.3.0-graphext8",
"version": "3.3.0-graphext9",
"description": "Components related to selecting items from a list",
"main": "lib/cjs/index.js",
"module": "lib/esm/index.js",
Expand Down Expand Up @@ -34,7 +34,7 @@
"verify": "npm-run-all compile -p dist test lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/core": "3.9.0-graphext13",
"classnames": "^2.2",
"tslib": "^1.9.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/table-dev-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"verify": "npm-run-all -p dist lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/table": "3.3.0-graphext11",
"@blueprintjs/core": "3.9.0-graphext13",
"@blueprintjs/table": "3.3.0-graphext12",
"classnames": "^2.2.5",
"dom4": "^2.0.1",
"normalize.css": "^8.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/table/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blueprintjs/table",
"version": "3.3.0-graphext11",
"version": "3.3.0-graphext12",
"description": "Scalable interactive table component",
"main": "lib/cjs/index.js",
"module": "lib/esm/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"verify": "npm-run-all compile -p dist test lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/core": "3.9.0-graphext13",
"classnames": "^2.2",
"prop-types": "^15.6.0",
"tslib": "^1.9.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/timezone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"verify": "npm-run-all compile -p dist test lint"
},
"dependencies": {
"@blueprintjs/core": "3.9.0-graphext12",
"@blueprintjs/select": "3.3.0-graphext8",
"@blueprintjs/core": "3.9.0-graphext13",
"@blueprintjs/select": "3.3.0-graphext9",
"classnames": "^2.2",
"moment": "^2.14.1",
"moment-timezone": "^0.5.13",
Expand Down
3 changes: 3 additions & 0 deletions resources/icons/16px/g-docs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions resources/icons/16px/g-publish.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions resources/icons/20px/g-docs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions resources/icons/20px/g-publish.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 91c6f0a

Please sign in to comment.