# HG changeset patch # User Jaroslav Tulach # Date 1391837020 -3600 # Node ID 3e372ded7adc063b3ad6c5a554493fa0b325dffb # Parent 5f851f669a152c007988e5ed79f4fac2cb0b2ca5 A bit of responsive design and using OK sign for discovered bombs diff -r 5f851f669a15 -r 3e372ded7adc minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java Fri Feb 07 21:36:27 2014 +0100 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java Sat Feb 08 06:23:40 2014 +0100 @@ -54,12 +54,13 @@ @Property(name = "mine", type = boolean.class) }) static class SquareModel { - @ComputedProperty static String text(SquareType state) { + @ComputedProperty static String html(SquareType state) { if (state == null) return " "; switch (state) { case EXPLOSION: return "B"; case UNKNOWN: return "?"; - case N_0: return " "; + case DISCOVERED: return "✔"; + case N_0: return " "; } return "" + state.ordinal(); } diff -r 5f851f669a15 -r 3e372ded7adc minesweeper/src/main/webapp/pages/index.html --- a/minesweeper/src/main/webapp/pages/index.html Fri Feb 07 21:36:27 2014 +0100 +++ b/minesweeper/src/main/webapp/pages/index.html Sat Feb 08 06:23:40 2014 +0100 @@ -31,6 +31,12 @@ + + + + + +

@@ -71,7 +77,7 @@ - +

@@ -84,7 +90,7 @@ diff -r 5f851f669a15 -r 3e372ded7adc minesweeper/src/main/webapp/pages/mines-phone-large.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/minesweeper/src/main/webapp/pages/mines-phone-large.css Sat Feb 08 06:23:40 2014 +0100 @@ -0,0 +1,32 @@ +/** + * The MIT License (MIT) + * + * Copyright (C) 2013 Jaroslav Tulach + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +table.field td { + padding: 4px; + width: 28px; + height: 28px; + font-size: 2em; +} +h1 { + font-size: 15px; +} \ No newline at end of file diff -r 5f851f669a15 -r 3e372ded7adc minesweeper/src/main/webapp/pages/mines-phone-small.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/minesweeper/src/main/webapp/pages/mines-phone-small.css Sat Feb 08 06:23:40 2014 +0100 @@ -0,0 +1,32 @@ +/** + * The MIT License (MIT) + * + * Copyright (C) 2013 Jaroslav Tulach + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +table.field td { + padding: 4px; + width: 24px; + height: 24px; + font-size: 1.6em; +} +h1 { + font-size: 12px; +} \ No newline at end of file diff -r 5f851f669a15 -r 3e372ded7adc minesweeper/src/main/webapp/pages/mines-tablet-large.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/minesweeper/src/main/webapp/pages/mines-tablet-large.css Sat Feb 08 06:23:40 2014 +0100 @@ -0,0 +1,32 @@ +/** + * The MIT License (MIT) + * + * Copyright (C) 2013 Jaroslav Tulach + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +table.field td { + padding: 8px; + width: 42px; + height: 42px; + font-size: 3em; +} +h1 { + font-size: 22px; +} \ No newline at end of file diff -r 5f851f669a15 -r 3e372ded7adc minesweeper/src/main/webapp/pages/mines-tablet-small.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/minesweeper/src/main/webapp/pages/mines-tablet-small.css Sat Feb 08 06:23:40 2014 +0100 @@ -0,0 +1,32 @@ +/** + * The MIT License (MIT) + * + * Copyright (C) 2013 Jaroslav Tulach + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +table.field td { + padding: 6px; + width: 34px; + height: 34px; + font-size: 2.4em; +} +h1 { + font-size: 18px; +} \ No newline at end of file diff -r 5f851f669a15 -r 3e372ded7adc minesweeper/src/main/webapp/pages/mines.css --- a/minesweeper/src/main/webapp/pages/mines.css Fri Feb 07 21:36:27 2014 +0100 +++ b/minesweeper/src/main/webapp/pages/mines.css Sat Feb 08 06:23:40 2014 +0100 @@ -35,10 +35,11 @@ table.field td { border: 1px solid black; padding:10px; - width: 10%; - height: 10%; + width: 56px; + height: 56px; vertical-align: middle; text-align: center; + font-size:4em; } .container { margin:10px;